Skip to content

Commit

Permalink
Replaces all instances of the tgstation2 map with Box Station (Skyrat…
Browse files Browse the repository at this point in the history
…-SS13#28463)

* Replaces all instances of the tgstation2 map with BoxStation

* Fix basemap
  • Loading branch information
Cyberboss authored and AnturK committed Jun 25, 2017
1 parent ed63dc9 commit 94effbd
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions _maps/basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\TgStation\tgstation.2.1.3.dmm"
#include "map_files\BoxStation\BoxStation.dmm"
#include "map_files\Cerestation\cerestation.dmm"

#ifdef TRAVISBUILDING
#include "templates.dm"
#endif

#endif
1 change: 1 addition & 0 deletions _maps/boxstation.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/boxstation.json"
4 changes: 2 additions & 2 deletions _maps/tgstation2.json → _maps/boxstation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map_name": "Box Station",
"map_path": "map_files/TgStation",
"map_file": "tgstation.2.1.3.dmm",
"map_path": "map_files/BoxStation",
"map_file": "BoxStation.dmm",
"minetype": "lavaland",
"transition_config": "default"
}
File renamed without changes.
1 change: 0 additions & 1 deletion _maps/tgstation2.dm

This file was deleted.

6 changes: 3 additions & 3 deletions code/datums/map_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
// -Cyberboss

/datum/map_config
var/config_filename = "_maps/tgstation2.json"
var/config_filename = "_maps/boxstation.json"
var/map_name = "Box Station"
var/map_path = "map_files/TgStation"
var/map_file = "tgstation.2.1.3.dmm"
var/map_path = "map_files/BoxStation"
var/map_file = "BoxStation.dmm"

var/minetype = "lavaland"

Expand Down
2 changes: 1 addition & 1 deletion config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Format:
disabled (disables the map)
endmap

map tgstation2
map boxstation
default
#voteweight 1.5
endmap
Expand Down

0 comments on commit 94effbd

Please sign in to comment.