Merge pull request #867 from Kitsune44/reactivedrop_beta

Maps: Fixes.

Author: BenLubar

contentsrc/mapsrc/ASI-Jac1-LandingBay_01.vmf

@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "7397"
-	"mapversion" "3335"
+	"mapversion" "3336"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -62,7 +62,7 @@ viewsettings
 world
 {
 	"id" "152641"
-	"mapversion" "3335"
+	"mapversion" "3336"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -203850,7 +203850,7 @@ entity
 		"OnComputerDataDownloaded" "part_sparks_rocket_3Start1-1"
 		"OnComputerDataDownloaded" "countdown_escapeStartCountdown4-1"
 		"OnComputerDataDownloaded" "marker_obj_countdownEnable4-1"
-		"OnComputerDataDownloaded" "req_tech_marineDisableTechMarineReq0-1"
+		"OnComputerHackCompleted" "req_tech_marineDisableTechMarineReq01"
 		"OnComputerDataDownloaded" "relay_open_exitTrigger01"
 		"OnComputerDataDownloaded" "light_nuke_startTurnOff4-1"
 		"OnComputerDataDownloaded" "light_nuke_blockedTurnOff4-1"
@@ -239700,6 +239700,7 @@ entity
 	"DefaultMusic" "asw_song.TimorBattle"
 	"FadeInTime" "0.0"
 	"FadeOutTime" "5.0"
+	"InterruptCustomTrack" "1"
 	"targetname" "song"
 	"origin" "-144.301 3076.11 72.9765"
 	editor

contentsrc/mapsrc/ASI-Jac7-TimorStation.vmf

@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "7397"
-	"mapversion" "891"
+	"mapversion" "892"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -32,7 +32,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "891"
+	"mapversion" "892"
 	"classname" "worldspawn"
 	"chaptertitle" "Wastelands Hell on this Rock"
 	"detailmaterial" "detail/detailsprites"
@@ -113690,6 +113690,7 @@ entity
 	"DefaultMusic" "area9800.WLBattleMusic01"
 	"FadeInTime" "1.0"
 	"FadeOutTime" "5"
+	"InterruptCustomTrack" "1"
 	"targetname" "Area9800_BM_01"
 	"origin" "-352 -168 17"
 	editor
@@ -132921,6 +132922,7 @@ entity
 	{
 		"OnButtonHackCompleted" "SmallBridge_02Open0-1"
 		"OnButtonHackCompleted" "node_link02TurnOn2-1"
+		"OnButtonHackCompleted" "@tech_reqDisableTechMarineReq01"
 	}
 	solid
 	{
@@ -134949,6 +134951,7 @@ entity
 	"id" "886081"
 	"classname" "func_asw_fade"
 	"AllowFade" "0"
+	"CollideWithMarines" "1"
 	"disablereceiveshadows" "0"
 	"disableshadows" "0"
 	"fade_opacity" "0"
@@ -155115,6 +155118,7 @@ entity
 	"id" "1626372"
 	"classname" "func_asw_fade"
 	"AllowFade" "1"
+	"CollideWithMarines" "1"
 	"fade_opacity" "255"
 	"origin" "512 -2192 -384"
 	"renderamt" "255"
@@ -156801,6 +156805,7 @@ entity
 	"id" "1626442"
 	"classname" "func_asw_fade"
 	"AllowFade" "1"
+	"CollideWithMarines" "1"
 	"fade_opacity" "0"
 	"origin" "536 -2216 -384"
 	"renderamt" "255"
@@ -156973,6 +156978,7 @@ entity
 	"id" "1626463"
 	"classname" "func_asw_fade"
 	"AllowFade" "1"
+	"CollideWithMarines" "1"
 	"fade_opacity" "0"
 	"origin" "2128 -2776 -320"
 	"renderamt" "255"
@@ -157935,6 +157941,7 @@ entity
 	"id" "1649934"
 	"classname" "func_asw_fade"
 	"AllowFade" "0"
+	"CollideWithMarines" "1"
 	"fade_opacity" "0"
 	"origin" "2304 1120 -432"
 	"renderamt" "255"

contentsrc/mapsrc/rd-area9800WL.vmf

@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "7397"
-	"mapversion" "678"
+	"mapversion" "679"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -32,7 +32,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "678"
+	"mapversion" "679"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -127155,7 +127155,7 @@ entity
 		"OnComputerDataDownloaded" "hint_computerhackShowHint0-1"
 		"OnComputerDataDownloaded" "hint_improviseShowHint8-1"
 		"OnComputerDataDownloaded" "alarmPlaySound0-1"
-		"OnComputerDataDownloaded" "techDisableTechMarineReq0-1"
+		"OnComputerHackCompleted" "techDisableTechMarineReq01"
 		"OnComputerDataDownloaded" "marker_server_objectiveSetComplete0-1"
 		"OnComputerDataDownloaded" "marker1_escape_objEnable0-1"
 		"OnComputerDataDownloaded" "sprite_main_computerKill0-1"