Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,11 @@
 
 ## Changelog
 
-<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. -->
+<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to manipulate the system all you want, but it's best to shoot for clear communication right off the bat. -->
+
+<!--Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
+
+<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents, don't be too verbose. -->
 
 :cl:
 add: Added new mechanics or gameplay changes
@@ -31,6 +35,3 @@ config: changed some config setting
 admin: messed with admin stuff
 server: something server ops should know
 /:cl:
-
-<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
-<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->

_maps/_basemap.dm

@@ -27,6 +27,9 @@
 		#include "map_files\slumbridge\slumbridge.dmm"
 		#include "map_files\DaedalusPrison\DaedalusPrison.dmm"
 		#include "map_files\riptide\riptide.dmm"
+		#include "map_files\lavaoutpost\LavaOutpost.dmm"
+		#include "map_files\desertdam\desertdam.dmm"
+		#include "map_files\corsat\corsat.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif

_maps/corsat.json

@@ -0,0 +1,11 @@
+{
+    "map_name": "CORSAT Research Station",
+    "map_path": "map_files/corsat",
+    "map_file": "corsat.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+    "armor": "prison",
+    "quickbuilds": 2300,
+	"announce_text": "A classified distress signal has been picked up by our scanners, which have tracked the source to Nanotrasen's Corporate Orbital Research Station for Advanced Technology research station, known as CORSAT. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!"
+}

_maps/desertdam.json

@@ -0,0 +1,12 @@
+{
+    "map_name": "Chigusa",
+    "map_path": "map_files/desertdam",
+    "map_file": "desertdam.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+    "map_item_type": "/obj/item/map/desert_dam",
+    "armor": "desert",
+	"quickbuilds": 3300,
+	"announce_text": "We've lost contact with NT's extra-solar colony, \"Chigusa Dam\", on the planet \"Trivonus IV.\" Your ship has been dispatched to assist."
+}

_maps/lavaoutpost.json

@@ -0,0 +1,10 @@
+{
+    "map_name": "Lava Outpost V1",
+    "map_path": "map_files/lavaoutpost",
+    "map_file": "LavaOutpost.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+	"quickbuilds": 1800,
+	"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to LO145. Through use of emergency bluespace drive tech, the ship has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
+}

_maps/lv624.json

@@ -6,7 +6,7 @@
 		"basic": 1
 	},
     "armor": "jungle",
-	"quickbuilds": 1400,
+	"quickbuilds": 2000,
 	"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to a third generation colony, known as LV-624. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!",
 	"traits":[{
 		"weather_acidrain": true