Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-25216
Fluffy-Frontier · Nov 24, 2023 · 0c6dc6a · 0c6dc6a
2 parents 684fa48 + 82c0b71
commit 0c6dc6a
Show file tree

Hide file tree

Showing 132 changed files with 832 additions and 4,239 deletions.
diff --git a/.github/gbp.toml b/.github/gbp.toml
@@ -9,6 +9,7 @@ reset_label = "GBP: Reset"
 "Code Improvement" = 2
 "Documentation" = 1
 "Feature" = -6
+"Good First PR" = 6
 "Feedback" = 2
 "Fix" = 3
 "Grammar and Formatting" = 1

diff --git a/_maps/skyrat/automapper/automapper_config.toml b/_maps/skyrat/automapper/automapper_config.toml
@@ -197,39 +197,6 @@ required_map = "IceBoxStation.dmm"
 coordinates = [202, 16, 2]
 trait_name = "Station"
 
-# KILOSTATION MAP EDITS
-# Kilostation Arrivals
-[templates.kilostation_arrivals]
-map_files = ["kilostation_arrivals.dmm"]
-directory = "_maps/skyrat/automapper/templates/kilostation/"
-required_map = "KiloStation.dmm"
-coordinates = [151, 80, 1]
-trait_name = "Station"
-
-# Kilostation ERT Bay and Barber
-[templates.kilostation_ert_bay]
-map_files = ["kilostation_ert_bay.dmm"]
-directory = "_maps/skyrat/automapper/templates/kilostation/"
-required_map = "KiloStation.dmm"
-coordinates = [77, 151, 1]
-trait_name = "Station"
-
-# Kilostation Cryo
-[templates.kilostation_cryo]
-map_files = ["kilostation_cryo.dmm"]
-directory = "_maps/skyrat/automapper/templates/kilostation/"
-required_map = "KiloStation.dmm"
-coordinates = [59, 118, 1]
-trait_name = "Station"
-
-# Kilostation Armory
-[templates.kilostation_armory]
-map_files = ["kilostation_armory.dmm"]
-directory = "_maps/skyrat/automapper/templates/kilostation/"
-required_map = "KiloStation.dmm"
-coordinates = [81, 80, 1]
-trait_name = "Station"
-
 # TRAMSTATION MAP EDITS
 # Tramstation Arrivals
 [templates.tramstation_arrivals]

diff --git a/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm