Merge pull request #3649 from BEEmod/dev

Version 4.39.0
BEEmod · Feb 21, 2021 · b6ecf72 · b6ecf72
2 parents d52c422 + 92faac8
commit b6ecf72
Show file tree

Hide file tree

Showing 39 changed files with 1,212 additions and 2,172 deletions.
diff --git a/icons/items/blocks/antigel.pdn b/icons/items/blocks/antigel.pdn
diff --git a/packages/Lautaro/protruding_ped_buttons/info.txt b/packages/Lautaro/protruding_ped_buttons/info.txt
@@ -88,8 +88,7 @@
 					}
 				"Instances"
 					{
-					"bee2_ped_fwd" "instances/BEE2/p1/items/lautaro/protrude_ped.vmf"
-					"bee2_ped_rev" "instances/BEE2/p1/items/lautaro/protrude_ped_rev.vmf"
+					"bee2_ped" "instances/BEE2/p1/items/lautaro/protrude_ped.vmf"
 					}
 				"IOConf"
 					{

diff --git a/packages/Lautaro/protruding_ped_buttons/items/protruding_clean/editoritems.txt b/packages/Lautaro/protruding_ped_buttons/items/protruding_clean/editoritems.txt
@@ -124,8 +124,7 @@
 				{
 				"Name"  "instances/BEE2/clean/items/lautaro/protrude_ped_right_black.vmf"
 				}
-			"bee2_ped_fwd" "instances/BEE2/clean/items/lautaro/protrude_ped.vmf"
-			"bee2_ped_rev" "instances/BEE2/clean/items/lautaro/protrude_ped_rev.vmf"
+			"bee2_ped" "instances/BEE2/clean/items/lautaro/protrude_ped.vmf"
 			}
 		"TargetName"    "pro_ped"
 		"Offset"        "64 64 64"

diff --git a/packages/Lautaro/protruding_ped_buttons/items/protruding_clean/vbsp_config.cfg b/packages/Lautaro/protruding_ped_buttons/items/protruding_clean/vbsp_config.cfg
@@ -56,18 +56,23 @@
 				    }
 			    }				
 		    }
-
+
+		"Result"
+			{
+			"ChangeInstance" "<ITEM_LAUTARO_PROTRUDING_PEDESTAL:bee2_ped>"
+			}
+
 		"Condition"
 			{
 			// Turn around if checked.
 			"instvar" "$start_reversed = 1"
 			"Result"
 				{
-				"ChangeInstance" "<ITEM_LAUTARO_PROTRUDING_PEDESTAL:bee2_ped_rev>"
-				}
-			"Else"
-				{
-				"ChangeInstance" "<ITEM_LAUTARO_PROTRUDING_PEDESTAL:bee2_ped_fwd>"
+				"RotateInst"
+					{
+					"Angle" "0 0 180"
+					"Around" "64 0 -48"
+					}
 				}
 			}
 
@@ -92,4 +97,4 @@
 				}
 			}
 		}	
-	}	
+	}	
diff --git a/...utaro/protruding_ped_buttons/resources/instances/clean/items/lautaro/protrude_ped_inf.vmf b/...utaro/protruding_ped_buttons/resources/instances/clean/items/lautaro/protrude_ped_inf.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "8419"
-	"mapversion" "58"
+	"mapversion" "59"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "58"
+	"mapversion" "59"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -174,7 +174,7 @@ entity
 {
 	"id" "83"
 	"classname" "prop_button"
-	"angles" "-45 0 180"
+	"angles" "-90 0 0"
 	"delay" "1"
 	"istimer" "0"
 	"model" "models/props/switch001.mdl"

diff --git a/...o/protruding_ped_buttons/resources/instances/clean/items/lautaro/protrude_ped_locking.vmf b/...o/protruding_ped_buttons/resources/instances/clean/items/lautaro/protrude_ped_locking.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "8419"
-	"mapversion" "61"
+	"mapversion" "62"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -14,13 +14,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "64"
+	"nGridSpacing" "16"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "61"
+	"mapversion" "62"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -48,7 +48,7 @@ entity
 		"OnChangeToAllFalse" "lock_manSetStateBTrue0-1"
 		"OnChangeToAllFalse" "outputFireUser10-1"
 	}
-	"origin" "32 0 -32"
+	"origin" "8 0 -48"
 	editor
 	{
 		"color" "0 100 250"
@@ -204,7 +204,7 @@ entity
 {
 	"id" "83"
 	"classname" "prop_button"
-	"angles" "-45 0 -180"
+	"angles" "-90 0 0"
 	"delay" "1"
 	"istimer" "0"
 	"model" "models/props/switch001.mdl"

diff --git a/...utaro/protruding_ped_buttons/resources/instances/clean/items/lautaro/protrude_ped_rev.vmf b/...utaro/protruding_ped_buttons/resources/instances/clean/items/lautaro/protrude_ped_rev.vmf