breadhunt · breadhunt · May 14, 2022 · May 14, 2022 · May 14, 2022 · May 14, 2022
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -4,15 +4,6 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-# PsyKzz
-/code/datum/gamemodes/ @psykzz
-
-# KwinOriginal
-/_maps/ @KwinOriginal
-
-# TheBimmer231
-/icons/ @TheBimmer231
-
 # spookydonut
 /code/datums/supplypacks.dm @spookydonut
 /code/modules/shuttle/ @spookydonut

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -793,9 +793,7 @@ Any new map or map change must comply to these specifications.
 #### TGM Format & Map Merge
 
 New maps should be converted into the .tgm format before making a pull request. All edits to existing maps should be correctly map merged. This is done using the [Map Merge](https://tgstation13.org/wiki/Map_Merger) utility included in the repo to convert the file to TGM format.
-Likewise, you MUST run Map Merge prior to opening your PR when updating existing maps to minimize the change differences (even when using third party mapping programs such as FastDMM.)
-
-Failure to run Map Merge on a map after using third party mapping programs (such as FastDMM) greatly increases the risk of the map's key dictionary becoming corrupted by future edits after running map merge. Resolving the corruption issue involves rebuilding the map's key dictionary; id est rewriting all the keys contained within the map by reconverting it from BYOND to TGM format - which creates very large differences that ultimately delay the PR process and is extremely likely to cause merge conflicts with other pull requests.
+It is HIGHLY recommend to use third party mapping programs such as StrongDMM to make map changes easier.
 
 #### Variable Editing (Var-edits)
 
@@ -813,6 +811,24 @@ All maps should be 255x255 at most because of known issues with how BYOND behave
 
 Ais should be able to go everywhere on the map and it should be a single network if possible (two levels maps get a pass). Nodes can be placed up to 15 tiles apart, including diagonally. Any walls or lava between two nodes will block the link between them. Remember that ais are stupid, and that some obstacles are impossible to cross for them, so make their paths simple.
 
+#### Limited marine supplies in shipside maps
+
+Marine players are given limited supplies for preparation and deployment to enhance their gameplay while not sacrificing xenomorph players' fun. This line of thought follows the philosophy that all shipside maps are not chosen over another in consideration of supplies. For example: if marines choose Pillar of Spring over all other maps due to Pillar of Spring having more round start sentries and mortars, then mappers or contributors are obligated to eliminate the bias. While not an exhausive list, all shipside maps follow the same number of supplies:
+
+Chem lab:
+3 bluespace beakers
+
+CAS armament:
+6 30mm ammo crates
+2 banshees
+2 keepers
+2 widowmakers
+4 mini rockets
+2 GAU-21 30 mm cannons
+2 rocket pods
+2 minirocket pods
+
+This doesn't mean that mappers can't put extra supplies in planetside maps, though the extra supplies should be far away from landing zones to prevent marine players from favoring one map over another when considering supplies.
 #### Anti fob area system implemented
 
 Xenos should not be able to build near the fob before shutters are down. As such, wide enough areas around FOB must be placed. An area is set as non-buildable if it contains a shutter.
@@ -823,7 +839,7 @@ Every area must have an APC. A ground map must have roughly 10 generators, with
 
 #### Connected pipenet
 
-Every ship should have a believable and complete pipe system (ventilation, scrubbers). All pipes must belong to the same network. No pipes ending nowhere. Pipes groundside are not mandatory, but they add to the atmosphere and are usefull to xeno. 
+Every ship should have a believable and complete pipe system (ventilation, scrubbers). All pipes must belong to the same network. No pipes ending nowhere. Pipes groundside are not mandatory, but they add to the atmosphere and are usefull to xeno.
 
 #### Xenos related items (walls, weeds, silos, etc.)
 
@@ -836,7 +852,7 @@ Adding corpse spawner also add to the atmospher, but they are not mandatory.
 
 Any silo placed on map must be protected by enough fog. This fog only appears in crash gamemode and is here to prevent marines to go near xenos spawn locations
 
-#### Intel and nuke disk computers 
+#### Intel and nuke disk computers
 
 There should be a reasonnable amount of intel computers placed in areas with apc. 3 nuke disk computer (yellow, red, blue) must be placed around the map. A nuke landmark has to be present as well somewhere.
 

diff --git a/README.md b/README.md
@@ -1,32 +1,97 @@
- # TerraGov Marine Corps
-[![Percentage of issues still open](https://isitmaintained.com/badge/open/tgstation/TerraGov-Marine-Corps.svg)](https://isitmaintained.com/project/tgstation/TerraGov-Marine-Corps "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/tgstation/TerraGov-Marine-Corps.svg)](https://isitmaintained.com/project/tgstation/TerraGov-Marine-Corps "Average time to resolve an issue")
 
- [![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://forthebadge.com) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
+<h1>
 
- This is a fork based off the July-2018 version of ColonialMarines. To see the original, GPL repo, go [here](https://github.com/MrStonedOne/cmhistory)
+TerraGov Marine Corps 
+[![Badge Issues]][Issues]
+[![Badge Time]][Time]
 
-Code and other contributions are licensed under AGPL unless otherwise specified below
+</h1>
 
-Artwork added after -this commit- is CC-BY-NC 3.0
+<div align = center>
 
-Sprites added in the PR https://github.com/tgstation/TerraGov-Marine-Corps/pull/367 are licensed under CC-BY-NC 3.0
-See commit 36b8db4952be79a79b28a6738889d9e9eb23b12a
+![Badge Resentment]![Badge Dept][![Badge Byond]][Byond]
 
-Sprites added in commit d407e97e26ee5e6bb1daf945a8eb3bd9a6b11976 are CC-BY-NC 3.0
+</div>
 
-All sounds added/remixed in the PRs:
-https://github.com/tgstation/TerraGov-Marine-Corps/pull/5261
-https://github.com/tgstation/TerraGov-Marine-Corps/pull/5861
-are licensed under CC-BY-NC-SA 3.0
+<br>
 
-All icons in the PR:
-https://github.com/tgstation/TerraGov-Marine-Corps/pull/6010
-are licensed under CC-BY-NC-SA 3.0
+## Licensing
 
-Rouny Sprite in the PR:
-https://github.com/tgstation/TerraGov-Marine-Corps/pull/6938
-are licensed under CC BY-SA 3.0
+This fork is based on the `July 2018` version of **[ColonialMarines]** .
 
-Sound added in PR https://github.com/tgstation/TerraGov-Marine-Corps/pull/5604 is taken from https://freesound.org/people/nicStage/sounds/127731/ (CC Attribution)
+<br>
+<br>
 
-The TGS DMAPI API is licensed as a subproject under the MIT license.
+<div align = center>
+
+*Contributions, if not otherwise specified,* <br>
+*are licensed under the **[AGPL][License AGPL]** license.*
+
+<br>
+<br>
+
+Asset Type      | Source                                 | License
+:--------------:|:--------------------------------------:|:------------------------:
+`Artwork`       | *Everything After* **[#92ee94d]**      | [![Badge CC-BY-NC]][License CC-BY-NC]
+`Sprites`       | **[#367]** ( **[#36b8db4]** )          | [![Badge CC-BY-NC]][License CC-BY-NC]
+`Sprites`       | **[#d407e97]**                         | [![Badge CC-BY-NC]][License CC-BY-NC]
+`Sounds`        | **[#5261]** **[#5861]**               | [![Badge CC-BY-NC-SA]][License CC-BY-NC-SA]
+`Icons`         | **[#6010]**                            | [![Badge CC-BY-NC-SA]][License CC-BY-NC-SA]
+`Rouny Sprites` | **[#6938]**                            | [![Badge CC-BY-SA]][License CC-BY-SA]
+`Sounds`        | **[#5604]** *from* **[FreeSound.org]** | [![Badge CC-BY]][License CC-BY]
+`TGS DMAPI`     |                                        | [![Badge MIT]][License MIT]
+
+</div>
+
+<!----------------------------------{ Badges }--------------------------------->
+
+[Badge Resentment]: https://forthebadge.com/images/badges/built-with-resentment.svg
+[Badge Issues]: https://isitmaintained.com/badge/open/tgstation/TerraGov-Marine-Corps.svg
+[Badge Byond]: https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif
+[Badge Time]: https://isitmaintained.com/badge/resolution/tgstation/TerraGov-Marine-Corps.svg
+[Badge Dept]: https://forthebadge.com/images/badges/contains-technical-debt.svg
+
+
+<!------------------------------{ License Badges }----------------------------->
+
+[Badge CC-BY-NC-SA]: https://licensebuttons.net/l/by-nc-sa/4.0/80x15.png
+[Badge CC-BY-SA]: https://licensebuttons.net/l/by-sa/4.0/80x15.png
+[Badge CC-BY-NC]: https://licensebuttons.net/l/by-nc/4.0/80x15.png
+[Badge CC-BY]: https://licensebuttons.net/l/by/4.0/80x15.png
+[Badge AGPL]: https://img.shields.io/badge/License-AGPL_v3-blue.svg?style=flat
+[Badge MIT]: https://img.shields.io/badge/License-MIT-yellow.svg?style=flat
+
+
+<!---------------------------------{ Licenses }-------------------------------->
+
+[License CC-BY-NC-SA]: https://creativecommons.org/licenses/by-nc-sa/4.0/ 'Creative Commons BY-NC-SA'
+[License CC-BY-SA]:    https://creativecommons.org/licenses/by-sa/4.0/    'Creative Commons BY-SA'
+[License CC-BY-NC]:    https://creativecommons.org/licenses/by-nc/4.0/    'Creative Commons BY-NC'
+[License CC-BY]:       https://creativecommons.org/licenses/by/4.0/       'Creative Commons BY'
+[License AGPL]:        https://www.gnu.org/licenses/agpl-3.0
+[License MIT]:         https://opensource.org/licenses/MIT
+
+
+<!-----------------------------{ Licenses Material }--------------------------->
+
+[#d407e97]: https://github.com/tgstation/TerraGov-Marine-Corps/commit/d407e97e26ee5e6bb1daf945a8eb3bd9a6b11976
+[#36b8db4]: https://github.com/tgstation/TerraGov-Marine-Corps/commit/36b8db4952be79a79b28a6738889d9e9eb23b12a
+[#92ee94d]: https://github.com/tgstation/TerraGov-Marine-Corps/commit/92ee94da6e144d4420c1ec4f83a4ee785d61dc9b
+
+[#6938]: https://github.com/tgstation/TerraGov-Marine-Corps/pull/6938
+[#6010]: https://github.com/tgstation/TerraGov-Marine-Corps/pull/6010
+[#5861]: https://github.com/tgstation/TerraGov-Marine-Corps/pull/5861
+[#5604]: https://github.com/tgstation/TerraGov-Marine-Corps/pull/5604
+[#5261]: https://github.com/tgstation/TerraGov-Marine-Corps/pull/5261
+[#367]: https://github.com/tgstation/TerraGov-Marine-Corps/pull/367
+
+
+<!-----------------------------------{ Other }--------------------------------->
+
+[Issues]: https://isitmaintained.com/project/tgstation/TerraGov-Marine-Corps 'Percentage of issues still open'
+[Time]: https://isitmaintained.com/project/tgstation/TerraGov-Marine-Corps 'Average time to resolve an issue'
+
+[Byond]: https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a
+
+[ColonialMarines]: https://github.com/MrStonedOne/cmhistory
+[FreeSound.org]: https://freesound.org/people/nicStage/sounds/127731/
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -17,8 +17,8 @@
 		#include "map_files\icy_caves\icy_caves.dmm"
 		#include "map_files\Sulaco\Sulaco.dmm"
 		#include "map_files\Research_Outpost\Research_Outpost.dmm"
-		#include "map_files\Barrenquilla_Mining\Barrenquilla_Mining_Facility.dmm"
 		#include "map_files\Magmoor_Digsite_IV\Magmoor_Digsite_IV.dmm"
+		#include "map_files\Orion_Military_Outpost\orionoutpost.dmm"
 		#include "map_files\Twin_Pillars\Twin_Pillars.dmm"
 		#include "map_files\Minerva\TGS_Minerva.dmm"
 		#ifdef CIBUILDING

diff --git a/_maps/barrenquilla_mining.json b/_maps/barrenquilla_mining.json
diff --git a/_maps/icarus_military_port.json b/_maps/icarus_military_port.json
@@ -0,0 +1,6 @@
+{
+    "map_name": "Icarus Military Port",
+    "map_path": "map_files/Icarus_Military_Port",
+    "map_file": "icarus_military_port.dmm",
+    "announce_text": "Something for the lore nuts to write"
+}