Merge remote-tracking branch 'refs/remotes/origin/dev' into fge_logic

BEEmod · Mar 7, 2016 · 66cdee2 · 66cdee2
2 parents ae805e7 + 971013d
commit 66cdee2
Show file tree

Hide file tree

Showing 107 changed files with 14,218 additions and 10,363 deletions.
diff --git a/icons/items/csf.png b/icons/items/csf.png
diff --git a/icons/items/fdf.png b/icons/items/fdf.png
diff --git a/icons/items/old/csf.png b/icons/items/old/csf.png
diff --git a/icons/items/old/fdf.png b/icons/items/old/fdf.png
diff --git a/icons/items/old/mif.png b/icons/items/old/mif.png
diff --git a/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."

diff --git a/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."

diff --git a/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."

diff --git a/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt b/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."

diff --git a/packages/apTag/tagItems/items/gel_fizz_over/properties.txt b/packages/apTag/tagItems/items/gel_fizz_over/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."

diff --git a/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt b/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."

diff --git a/packages/bee1/portal/items/pedestal/editoritems.txt b/packages/bee1/portal/items/pedestal/editoritems.txt
@@ -150,6 +150,13 @@
 				"Deactivate"	"instance:counter;Subtract"
 			}
 		}
+		"Outputs"
+		{
+			"CONNECTION_STANDARD"
+			{
+				"Activate"		"instance:pedestal;OnUser1"
+			}
+		}
 		"OccupiedVoxels"
 		{
 			"Voxel"

diff --git a/packages/bee1/portal/items/pedestal/properties.txt b/packages/bee1/portal/items/pedestal/properties.txt
@@ -6,7 +6,7 @@
 	"Description"
 		{
 		"Line"		"Fires portals. Can rotate automatically before being collected by the player. In Aperture Tag, Portal Guns cannot be picked up (only firing portals)."
-		"Bullet"	"When picked up, autoportals of the same colour permanently deactivate."
+		"Bullet"	"When picked up, autoportals of the same colour permanently deactivate, and the output activates."
 		"Bullet"	"Weighted fires both (use Start Reversed to choose)."
 		"Bullet"	"Cube is blue-only."
 		"Bullet"	"Sphere is orange-only."

diff --git a/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/fire_blue.vmf b/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/fire_blue.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "6432"
-	"mapversion" "221"
+	"mapversion" "223"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "221"
+	"mapversion" "223"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -194,8 +194,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[4.40119 38.5435 16.9271]"
-		"look" "[22.3904 -159.104 -154.382]"
+		"position" "[3.64801 12.886 -11.0349]"
+		"look" "[-28.0185 -159.661 -205.867]"
 	}
 }
 cordons

diff --git a/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/fire_blue_dual.vmf b/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/fire_blue_dual.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "6432"
-	"mapversion" "220"
+	"mapversion" "221"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "220"
+	"mapversion" "221"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -182,8 +182,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[7.31338 30.3172 0.974903]"
-		"look" "[0.509824 -213.351 -95.537]"
+		"position" "[5.54071 23.2071 -14.1271]"
+		"look" "[-46.2763 -190.989 -156.148]"
 	}
 }
 cordons

diff --git a/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/fire_oran.vmf b/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/fire_oran.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "6432"
-	"mapversion" "214"
+	"mapversion" "215"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "214"
+	"mapversion" "215"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -149,6 +149,7 @@ entity
 		"OnPlayerPickup" "@close_orange_autoportalsFireUser40-1"
 		"OnPlayerPickup" "@voice_oran_pgunTrigger0.81"
 		"OnPlayerPickup" "@player_has_oranTrigger0-1"
+		"OnPlayerPickup" "pedestalFireUser10-1"
 	}
 	"origin" "12 -1.04907e-006 -18"
 	editor
@@ -195,7 +196,7 @@ cameras
 	camera
 	{
 		"position" "[-17.8309 -7.82165 -2.08832]"
-		"look" "[128 101.274 -190.681]"
+		"look" "[121.168 94.6572 -199.352]"
 	}
 }
 cordons

diff --git a/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/pedestal.vmf b/packages/bee1/portal/resources/instances/clean/items/BEE/pgun/pedestal.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "6432"
-	"mapversion" "214"
+	"mapversion" "219"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -26,7 +26,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "214"
+	"mapversion" "219"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -1159,6 +1159,10 @@ entity
 	"StartDisabled" "0"
 	"SuppressAnimSounds" "0"
 	"targetname" "pedestal"
+	connections
+	{
+		"OnUser1" "proxyProxyRelay0-1"
+	}
 	"origin" "0 0 -64"
 	editor
 	{
@@ -1318,6 +1322,7 @@ entity
 	{
 		"OnFullyOpen" "pedestal_baseSetAnimationclose0-1"
 		"OnFullyOpen" "pedestalKill2.5-1"
+		"OnOpen" "pedestalFireUser10-1"
 	}
 	solid
 	{
@@ -1463,8 +1468,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[-6.01212 11.3221 11.5743]"
-		"look" "[-6.01212 11.3221 -250.599]"
+		"position" "[-4.92604 15.9007 -71.0175]"
+		"look" "[-19.8898 -117.507 -296.214]"
 	}
 }
 cordons