Merge pull request cmss13-devs#54 from 800maximum123/Forecon

Forecon

.github/workflows/update_changelog.yml

@@ -51,6 +51,6 @@ jobs:
         git commit -m "Automatic changelog compile [ci skip]" -a || true
     - name: "Push"
       if: steps.value_holder.outputs.ACTIONS_ENABLED
-      uses: ad-m/github-push-action@campaign
+      uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}

colonialmarines.dme

@@ -2500,6 +2500,7 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\_basemap.dm"
+#include "maps\map_files\golden_arrow_forecon\area.dm"
 #include "maps\map_files\LV671_Ark\LV671.dm"
 #include "maps\map_files\USCSS_Tortuga\tortuga_areas.dm"
 #include "void-marines\code\admin_tools.dm"

map_config/shipmaps.txt

@@ -42,4 +42,7 @@ map corsair
 endmap
 
 map tortuga
-endmap
+endmap
+
+map golden_arrow_forecon
+endmap

maps/golden_arrow_forecon.json

@@ -0,0 +1,9 @@
+{
+    "map_name": "USS Golden Arrow Forecon",
+    "map_path": "map_files/golden_arrow_forecon",
+    "map_file": "_golden_arrow_forecon.dmm",
+    "webmap_url": "GoldenArrow",
+    "traits": [{"Marine Main Ship": true}],
+    "nightmare_path": "maps/Nightmare/maps/golden_arrow/",
+    "platoon": "/datum/squad/marine/forecon"
+}

maps/map_files/golden_arrow_forecon/area.dm

@@ -0,0 +1,63 @@
+/area/golden_arrow/forecone/platoon_commander_rooms
+	name = "\improper Platoon Commander's Rooms"
+	icon_state = "livingspace"
+
+/area/golden_arrow/forecone/medical
+	name = "\improper Medical"
+	icon_state = "medical"
+
+/area/golden_arrow/forecone/supply
+	name = "\improper Supply"
+	icon_state = "req"
+
+/area/golden_arrow/forecone/briefing
+	name = "\improper Briefing Area"
+	icon_state = "briefing"
+
+/area/golden_arrow/forecone/dorms
+	name = "\improper Dorms"
+	icon_state = "gruntrnr"
+
+/area/golden_arrow/forecone/canteen
+	name = "\improper Canteen"
+	icon_state = "food"
+
+/area/golden_arrow/forecone/cryo_cells
+	name = "\improper Cryo Cells"
+	icon_state = "cryo"
+
+/area/golden_arrow/forecone/prep_hallway
+	name = "\improper Prep Hallway"
+	icon_state = "port"
+
+/area/golden_arrow/forecone/platoon_sergeant
+	name = "\improper Platoon Sergeant Office"
+	icon_state = "alpha"
+
+/area/golden_arrow/forecone/shared_office
+	name = "\improper Shared Office"
+	icon_state = "alpha"
+
+/area/golden_arrow/forecone/squad_one
+	name = "\improper Squad One Prep"
+	icon_state = "charlie"
+
+/area/golden_arrow/forecone/squad_two
+	name = "\improper Squad Two Prep"
+	icon_state = "delta"
+
+/area/golden_arrow/forecone/synthcloset
+	name = "\improper Synthetic Storage Closet"
+	icon_state = "livingspace"
+
+/area/golden_arrow/forecone/firingrange
+	name = "\improper Firing Range"
+	icon_state = "firingrange"
+
+/area/golden_arrow/forecone/platoonprep
+	name = "\improper Platoon Prep"
+	icon_state = "bravo"
+
+/area/golden_arrow/forecone/platoonarmory
+	name = "\improper Platoon Armory"
+	icon_state = "alpha"

maps/map_files/golden_arrow_forecon/sprinkles/.gitkeep

@@ -0,0 +1 @@
+