Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-01-01 15:20:57 +0000
committerStijn Buys <ingar@osirion.org>2013-01-01 15:20:57 +0000
commit300a47793fc11a63c21339c2c47bc2002e0116a8 (patch)
treefaccbfe342fbc0b954c397dddd2135be64c4313f /base/maps/merchant/scalar.map
parent106742b36cb460c25e650b8d051ed0bb4517b633 (diff)
Ship updates, support for turrets, welcomed the Lancer as Colonial medium fighter.
Diffstat (limited to 'base/maps/merchant/scalar.map')
-rw-r--r--base/maps/merchant/scalar.map27
1 files changed, 19 insertions, 8 deletions
diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index b39a82b..f21c177 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -2007,10 +2007,11 @@ colors/grey75
// entity 9
{
"classname" "light"
-"origin" "-176.000000 0.000000 -26.000000"
+"origin" "-176.000000 -32.000000 -26.000000"
"light" "4"
"time" "0.1"
"spawnflags" "1"
+"offset" ".15"
}
// entity 10
{
@@ -2122,24 +2123,34 @@ colors/grey75
// entity 24
{
"classname" "location_cannon"
-"origin" "64.000000 72.000000 16.000000"
+"origin" "168.000000 0.000000 -8.000000"
}
// entity 25
{
-"classname" "location_cannon"
-"origin" "64.000000 -72.000000 16.000000"
-}
-// entity 26
-{
"classname" "fx_flare"
"origin" "-66.000000 -72.000000 -24.000000"
"spawnflags" "2"
"radius" "16"
}
-// entity 27
+// entity 26
{
"classname" "fx_flare"
"origin" "-66.000000 72.000000 -24.000000"
"spawnflags" "2"
"radius" "16"
}
+// entity 27
+{
+"classname" "light"
+"origin" "-176.000000 32.000000 -26.000000"
+"light" "4"
+"time" "0.1"
+"spawnflags" "1"
+"offset" ".65"
+}
+// entity 28
+{
+"classname" "location_turret"
+"origin" "-176.000000 0.000000 -32.000000"
+"angles" "90.000000 0.000000 -0.000000"
+}