Merge branch 'Spike29/stormkeep' into 'master'

[xonotic/xonotic-maps.pk3dir.git] / maps / oilrig.map

diff --git a/maps/oilrig.map b/maps/oilrig.map
index e4bcc694f41a5c2fc2fd535557aa2a32e132181e..5e3ccd9b789b7f37c237c2326809d45869529b23 100644 (file)
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -19309,12 +19309,12 @@ exx/floor-clang01
 ( 472 -64 400 ) ( 480 64 400 ) ( 472 64 400 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 2984 1552 1416 ) ( 2984 -1088 1416 ) ( 2424 1552 1416 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
-( 2936 1552 776 ) ( 2376 1552 776 ) ( 2936 1552 768 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
-( 2936 1552 776 ) ( 2936 1552 768 ) ( 2936 -1088 776 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
-( 2456 -1088 -2400 ) ( 3016 -1088 -2400 ) ( 2456 1552 -2400 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
-( 2376 -1088 768 ) ( 2376 -1088 776 ) ( 2936 -1088 768 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
-( -760 -1088 768 ) ( -760 1552 768 ) ( -760 -1088 776 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 2984 1552 960 ) ( 2984 -1088 960 ) ( 2424 1552 960 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 2936 1344 776 ) ( 2376 1344 776 ) ( 2936 1344 768 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 2744 1552 776 ) ( 2744 1552 768 ) ( 2744 -1088 776 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 2456 -1088 -2160 ) ( 3016 -1088 -2160 ) ( 2456 1552 -2160 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 2376 -976 768 ) ( 2376 -976 776 ) ( 2936 -976 768 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( -416 -1088 768 ) ( -416 1552 768 ) ( -416 -1088 776 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -19850,7 +19850,7 @@ terrain01x/blends-mars-rock02-ground01
 "light" "10"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "736.000000 -616.000000 944.000000"
 }
 {
@@ -23577,7 +23577,7 @@ exx/wall-bigrib02
 "light" "10"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "1776.000000 944.000000 144.000000"
 }
 {
@@ -23687,7 +23687,7 @@ exx/wall-bigrib02
 "targetname" "target_position4"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "960.000000 960.000000 -352.000000"
 }
 {
@@ -23843,7 +23843,7 @@ exx/wall-bigrib02
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
 }
 {
-"classname" "item_invincible"
+"classname" "item_shield"
 "origin" "856.000000 -432.000000 400.000000"
 }
 {
@@ -23861,7 +23861,7 @@ exx/wall-bigrib02
 "light" "5"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "1776.000000 392.000000 -656.000000"
 }
 {