Skip to content

Commit

Permalink
Merge pull request #3649 from BEEmod/dev
Browse files Browse the repository at this point in the history
Version 4.39.0
  • Loading branch information
TeamSpen210 authored Feb 21, 2021
2 parents d52c422 + 92faac8 commit b6ecf72
Show file tree
Hide file tree
Showing 39 changed files with 1,212 additions and 2,172 deletions.
Binary file added icons/items/blocks/antigel.pdn
Binary file not shown.
3 changes: 1 addition & 2 deletions packages/Lautaro/protruding_ped_buttons/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}

Expand All @@ -92,4 +97,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "8419"
"mapversion" "58"
"mapversion" "59"
"formatversion" "100"
"prefab" "0"
}
Expand All @@ -20,7 +20,7 @@ viewsettings
world
{
"id" "1"
"mapversion" "58"
"mapversion" "59"
"classname" "worldspawn"
"detailmaterial" "detail/detailsprites"
"detailvbsp" "detail.vbsp"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "8419"
"mapversion" "61"
"mapversion" "62"
"formatversion" "100"
"prefab" "0"
}
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

This file was deleted.

Loading

0 comments on commit b6ecf72

Please sign in to comment.