Merge branch 'master' into tacmap-refactor

.github/CONTRIBUTING.md

@@ -5,7 +5,7 @@
 	- [Introduction](#introduction)
 	- [Getting Started](#getting-started)
 	- [Meet the Team](#meet-the-team)
-		- [Head Maintainer and Project Manager](#head-maintainer-and-project-manager)
+		- [Head Maintainer and Maintainer Managers](#head-maintainer-and-maintainer-managers)
 		- [Maintainers](#maintainers)
 		- [Staff Tools and Major Rule changing PR’s](#staff-tools-and-major-rule-changing-prs)
 		- [Issue Managers](#issue-managers)
@@ -16,6 +16,7 @@
 			- [Writing understandable code](#writing-understandable-code)
 			- [Misc](#misc)
 	- [Pull Request Process](#pull-request-process)
+		- [A note on balance impacting PRs](#a-note-on-balance-impacting-prs)
 	- [Good Boy Points](#good-boy-points)
 	- [Porting features/sprites/sounds/tools from other codebases](#porting-featuresspritessoundstools-from-other-codebases)
 	- [Things you can work on](#things-you-can-work-on)
@@ -52,9 +53,9 @@ You can of course, as always, ask for help on the Discord channels or the forums
 
 ## Meet the Team
 
-### Head Maintainer and Project Manager
+### Head Maintainer and Maintainer Managers
 
-The Head Maintainer and Project Manager are responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not.
+The Head Maintainer and Maintainer Managers are responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not.
 
 ### Maintainers
 
@@ -162,7 +163,7 @@ There is no strict process when it comes to merging pull requests. Pull requests
 
 Certain PRs, such as those which directly change number values (i.e. health, recoil, damage) or add large pieces of content to the game (i.e. a new gun, a new dropship weapon, or a new xeno structure) can have the potential to highly impact game balance or gameflow.
 
-* If a Project Manager or Head Maintainer has not reviewed a pull request that impacts balance in 7 days, maintainers may review and merge the PR themselves.
+* If a Maintainer Manager or Head Maintainer has not reviewed a pull request that impacts balance in 7 days, maintainers may review and merge the PR themselves.
 
 * We understand that having something you have worked on for quite some time being denied can be frustrating. Therefore, it is recommended that you check with a maintainer before beginning to code your PR if you have any doubts that it will be accepted. This will save everyone's time and energy.
 

.github/alternate_byond_versions.txt

@@ -0,0 +1,9 @@
+# This file contains extra tests to run for specific BYOND versions.
+# This is useful for making sure we maintain compatibility with both older and newer versions,
+# while still having our main tests run on a guaranteed pinned version.
+
+# Format is version: map
+# Example:
+# 500.1337: runtimestation
+
+515.1603: lv624

.github/workflows/ci_suite.yml

@@ -83,6 +83,7 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       maps: ${{ steps.map_finder.outputs.maps }}
+      alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
     concurrency:
       group: find_all_maps-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
@@ -95,6 +96,11 @@ jobs:
           sed -i -e s+maps/+\"+g -e s+.json+\"+g maps_output.txt
           echo "Maps: $(cat maps_output.txt)"
           echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT
+      - name: Find Alternate Tests
+        id: alternate_test_finder
+        run: |
+          ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>.+)$")]' .github/alternate_byond_versions.txt)
+          echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Unit Tests
@@ -110,6 +116,31 @@ jobs:
     with:
       map: ${{ matrix.map }}
 
+  run_alternate_tests:
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'"
+    name: Alternate Tests
+    needs: [find_all_maps]
+    strategy:
+      fail-fast: false
+      matrix:
+        setup: ${{ fromJSON(needs.find_all_maps.outputs.alternate_tests) }}
+    concurrency:
+      group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.setup.major }}.${{ matrix.setup.minor }}-${{ matrix.setup.map }}
+      cancel-in-progress: true
+    uses: ./.github/workflows/run_unit_tests.yml
+    with:
+      map: ${{ matrix.setup.map }}
+      major: ${{ matrix.setup.major }}
+      minor: ${{ matrix.setup.minor }}
+
+  check_alternate_tests:
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'"
+    name: Check Alternate Tests
+    needs: [run_alternate_tests]
+    runs-on: ubuntu-20.04
+    steps:
+      - run: echo Alternate tests passed.
+
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Windows Build

.github/workflows/run_unit_tests.yml

@@ -38,7 +38,7 @@ jobs:
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
+          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror
       - name: Run Tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup

.tgs.yml

@@ -0,0 +1,12 @@
+version: 1
+byond: "514.1588"
+static_files:
+  - name: config
+  - name: data
+linux_scripts:
+  PreCompile.sh: tools/tgs_scripts/PreCompile.sh
+  WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh
+  InstallDeps.sh: tools/tgs_scripts/InstallDeps.sh
+windows_scripts:
+  PreCompile.bat: tools/tgs_scripts/PreCompile.bat
+security: Trusted

.vscode/extensions.json

@@ -1,13 +1,5 @@
 {
     "recommendations": [
-        "gbasood.byond-dm-language-support",
-        "platymuus.dm-langclient",
-        "arcanis.vscode-zipfs",
-        "EditorConfig.EditorConfig",
-        "stylemistake.auto-comment-blocks",
-        "anturk.dmi-editor",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode",
-        "donkie.vscode-tgstation-test-adapter"
+        "cmss13-devs.cm-extpack"
     ]
 }

code/__DEFINES/_macros.dm

@@ -8,12 +8,17 @@
 
 #define subtypesof(A) (typesof(A) - A)
 
+#ifdef EXPERIMENT_515_DONT_CACHE_REF
+/// Takes a datum as input, returns its ref string
+#define text_ref(datum) ref(datum)
+#else
 /// Takes a datum as input, returns its ref string, or a cached version of it
 /// This allows us to cache \ref creation, which ensures it'll only ever happen once per datum, saving string tree time
 /// It is slightly less optimal then a []'d datum, but the cost is massively outweighed by the potential savings
 /// It will only work for datums mind, for datum reasons
 /// : because of the embedded typecheck
 #define text_ref(datum) (isdatum(datum) ? (datum:cached_ref ||= "\ref[datum]") : ("\ref[datum]"))
+#endif
 
 #define addToListNoDupe(L, index) if(L) L[index] = null; else L = list(index)
 

code/__DEFINES/access.dm

@@ -35,7 +35,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_MARINE_RESEARCH 28
 #define ACCESS_MARINE_SEA    29
 #define ACCESS_MARINE_KITCHEN    30
-#define ACCESS_MARINE_CAPTAIN 31
+#define ACCESS_MARINE_CO 31
 #define ACCESS_MARINE_TL_PREP 32
 
 #define ACCESS_MARINE_MAINT 34

code/__DEFINES/blood.dm

@@ -4,3 +4,16 @@
 #define BLOOD_FEET (1<<2)
 
 #define BLOOD_ALL (BLOOD_BODY|BLOOD_HANDS|BLOOD_FEET)
+
+#define BLOOD_COLOR_HUMAN "#A10808"
+#define BLOOD_COLOR_SYNTHETIC "#EEEEEE"
+
+#define BLOOD_COLOR_NEAERA "#1d2cbf"
+
+#define BLOOD_COLOR_XENO "#dffc00"
+#define BLOOD_COLOR_XENO_ROYAL "#bbb900"
+
+#define BLOOD_COLOR_YAUTJA "#20d450"
+#define BLOOD_COLOR_YAUTJA_DARK "#5A934A"
+
+#define BLOOD_COLOR_ZOMBIE "#333333"

code/__DEFINES/chat.dm

@@ -15,6 +15,7 @@
 #define MESSAGE_TYPE_ADMINCHAT "adminchat"
 #define MESSAGE_TYPE_MODCHAT "modchat"
 #define MESSAGE_TYPE_MENTOR "mentor"
+#define MESSAGE_TYPE_STAFF_IC "staff_ic"
 #define MESSAGE_TYPE_EVENTCHAT "eventchat"
 #define MESSAGE_TYPE_ADMINLOG "adminlog"
 #define MESSAGE_TYPE_ATTACKLOG "attacklog"

code/__DEFINES/client_prefs.dm

@@ -0,0 +1,33 @@
+#define BE_ALIEN_AFTER_DEATH (1<<0)
+#define BE_AGENT (1<<1)
+
+#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself
+#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless
+#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking
+#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks
+#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines
+												   // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND
+#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand
+												   // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE
+#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallye jecting magazines from guns will cause you to unwield your gun
+												   // and put the empty magazine in your hand
+#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period
+#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed.
+#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them.
+#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm
+#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not
+#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat
+#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands
+#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off
+#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand.
+#define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot.
+#define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot.
+
+#define JOB_SLOT_RANDOMISED_SLOT -1
+#define JOB_SLOT_CURRENT_SLOT 0
+#define JOB_SLOT_RANDOMISED_TEXT "Randomise name and appearance"
+#define JOB_SLOT_CURRENT_TEXT "Current character"
+
+#define AGE_MIN 19 //youngest a character can be
+#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160.
+#define MAX_GEAR_COST 7 //Used in chargen for loadout limit.

code/__DEFINES/cooldowns.dm

@@ -1,6 +1,7 @@
 #define COOLDOWN_MOB_AUDIO "mob_audio_cooldown"
 #define COOLDOWN_IDLOCK_TEXTALERT "mob_idlock_textalert"
 #define COOLDOWN_HIJACK_BARRAGE "gamemode_explosive_barrage"
+#define COOLDOWN_HIJACK_GROUND_CHECK "gamemode_ground_check"
 #define COOLDOWN_ITEM_HOOD_SOUND "item_hood_sound"
 
 //Define for ship alt

code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm

@@ -28,6 +28,8 @@
 #define COMSIG_HUMAN_OVERLAY_APPLIED "human_overlay_applied"
 /// From /mob/living/carbon/human/remove_overlay(): (cache_index, overlay_image)
 #define COMSIG_HUMAN_OVERLAY_REMOVED "human_overlay_removed"
+/// From /datum/flaying_datum
+#define COMSIG_HUMAN_FLAY_ATTEMPT "human_flay_attempt"
 
 #define COMSIG_HUMAN_BONEBREAK_PROBABILITY "human_bonebreak_probability"
 
@@ -50,5 +52,14 @@
 //from /mob/living/carbon/human/equip_to_slot()
 #define COMSIG_HUMAN_EQUIPPED_ITEM "human_equipped_item"
 
+/// From /mob/proc/equip_to_slot_if_possible()
+#define COMSIG_HUMAN_ATTEMPTING_EQUIP "human_attempting_equip"
+	#define COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP (1<<0)
+
 //from /mob/living/carbon/human/Life()
 #define COMSIG_HUMAN_SET_UNDEFIBBABLE "human_set_undefibbable"
+
+/// from /datum/surgery_step/proc/attempt_step()
+#define COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS "human_surgery_apply_modifiers"
+/// From /mob/living/carbon/human/proc/get_flags_cold_protection()
+#define COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS "human_cold_protection_apply_modifiers"

code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm

@@ -43,6 +43,9 @@
 #define COMSIG_MOB_DRAGGED "mob_dragged"
 /// From /obj/item/proc/unequipped()
 #define COMSIG_MOB_ITEM_UNEQUIPPED "mob_item_unequipped"
+/// From /mob/proc/equip_to_slot_if_possible()
+#define COMSIG_MOB_ATTEMPTING_EQUIP "mob_attempting_equip"
+	#define COMPONENT_MOB_CANCEL_ATTEMPT_EQUIP (1<<0)
 
 /// For when a mob is devoured by a Xeno
 #define COMSIG_MOB_DEVOURED "mob_devoured"
@@ -105,3 +108,5 @@
 #define COMSIG_MOB_STAT_SET_ALIVE "mob_stat_set_alive"
 //from /mob/living/set_stat()
 #define COMSIG_MOB_STAT_SET_DEAD "mob_stat_set_dead"
+
+#define COMSIG_GHOST_MOVED "ghost_moved"

code/__DEFINES/dcs/signals/atom/signals_item.dm

@@ -2,6 +2,8 @@
 #define COMSIG_ITEM_ATTEMPT_ATTACK "item_attempt_attack" //Triggered on the target mob.
 	#define COMPONENT_CANCEL_ATTACK (1<<0)
 
+#define COMSIG_ITEM_ATTACK_AIRLOCK "item_attack_airlocK"
+	#define COMPONENT_CANCEL_AIRLOCK_ATTACK (1<<0)
 
 /// from /obj/item/attackby() : (obj/item, mob/user)
 #define COMSIG_ITEM_ATTACKED "item_attacked"

code/__DEFINES/dcs/signals/atom/signals_obj.dm

@@ -22,3 +22,5 @@
 
 /// from /obj/structure/transmitter/update_icon()
 #define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon"
+
+#define COMSIG_TENT_COLLAPSING "tent_collapsing"

code/__DEFINES/dcs/signals/atom/signals_turf.dm

@@ -4,6 +4,7 @@
 #define COMSIG_TURF_ENTER "turf_enter"
 	#define COMPONENT_TURF_ALLOW_MOVEMENT (1<<0)
 	#define COMPONENT_TURF_DENY_MOVEMENT  (1<<1)
+#define COMSIG_TURF_ENTERED "turf_entered"
 
 /// Called when a bullet hits a turf
 #define COMSIG_TURF_BULLET_ACT "turf_bullet_act"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -48,5 +48,8 @@
 // Used for smothering fires upon weather event start/stop
 #define COMSIG_GLOB_WEATHER_CHANGE "!weather_event_changed"
 
+/// From /obj/structure/machinery/telecomms/proc/tcomms_shutdown(), called when the relay turns off
+#define COMSIG_GLOB_GROUNDSIDE_TELECOMM_TURNED_OFF "!groundside_telecomm_turned_off"
+
 /// From /datum/admins/proc/force_predator_round()
 #define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged"

code/__DEFINES/defenses.dm

@@ -8,7 +8,7 @@
 // Defines for barricade upgrades
 #define BARRICADE_UPGRADE_BURN "Biohazard Upgrade (+Burn)"
 #define BARRICADE_UPGRADE_BRUTE "Reinforced Upgrade (+Brute)"
-#define BARRICADE_UPGRADE_EXPLOSIVE "Explosive Upgrade (+Explosive)"
+#define BARRICADE_UPGRADE_ANTIFF "Composite Upgrade (++Explosive, ++Projectile, ++Fire)"
 
 // Defines for defense stats
 #define DEFENSE_FUNCTIONAL 0

code/__DEFINES/dropships.dm

@@ -9,3 +9,4 @@
 #define DROPSHIP_MAX_AUTO_DELAY 60 SECONDS
 #define DROPSHIP_MIN_AUTO_DELAY 10 SECONDS
 #define DROPSHIP_AUTO_RETRY_COOLDOWN 20 SECONDS
+#define DROPSHIP_MEDEVAC_COOLDOWN 20 SECONDS

code/__DEFINES/human.dm

@@ -213,8 +213,3 @@
 #define RELIGION_AGNOSTICISM "Agnostic"
 
 #define MAXIMUM_DROPPED_OBJECTS_REMEMBERED 2
-
-///////////////////MISC HUMAN FLAGS (LINKED TO VAR: FLAGS_HUMAN_MISC)///////////////////
-
-#define HUMAN_FLAG_CHANGED (1<<0)
-

code/__DEFINES/job.dm

@@ -163,24 +163,25 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 //------------------------------------
 
 //-------- PMC --------//
-#define JOB_PMC "PMC Standard"
+#define JOB_PMC_STANDARD "Weyland-Yutani PMC (Standard)"
 #define JOB_PMC_ENGINEER "PMC Corporate Technician"
 #define JOB_PMC_MEDIC "PMC Corporate Medic"
 #define JOB_PMC_DOCTOR "PMC Trauma Surgeon"
 #define JOB_PMC_INVESTIGATOR "PMC Medical Investigator"
+#define JOB_PMC_DETAINER "Weyland-Yutani PMC (Detainer)"
 #define JOB_PMC_ELITE "PMC Elite"
 #define JOB_PMC_GUNNER "PMC Support Weapons Specialist" //Renamed from Specialist to Support Specialist as it only has SG skills.
 #define JOB_PMC_SNIPER "PMC Weapons Specialist" //Renamed from Sharpshooter to specialist as it uses specialist skills.
-#define JOB_PMC_CREWMAN "PMC Crewman"
+#define JOB_PMC_CREWMAN "Weyland-Yutani PMC (Crewman)"
 #define JOB_PMC_NINJA "PMC Ninja"
 #define JOB_PMC_XENO_HANDLER "PMC Xeno Handler"
 #define JOB_PMC_COMMANDO "PMC Commando"
 #define JOB_PMC_LEADER "PMC Leader"
 #define JOB_PMC_LEAD_INVEST "PMC Lead Investigator"
 #define JOB_PMC_DIRECTOR "PMC Site Director"
-#define JOB_PMC_SYNTH    "PMC Support Synthetic"
+#define JOB_PMC_SYNTH "PMC Support Synthetic"
 
-#define JOB_PMC_GRUNT_LIST list(JOB_PMC, JOB_PMC_ENGINEER, JOB_PMC_MEDIC, JOB_PMC_INVESTIGATOR, JOB_PMC_ELITE, JOB_PMC_GUNNER, JOB_PMC_SNIPER, JOB_PMC_CREWMAN, JOB_PMC_NINJA, JOB_PMC_XENO_HANDLER, JOB_PMC_COMMANDO, JOB_PMC_LEADER, JOB_PMC_LEAD_INVEST)
+#define JOB_PMC_GRUNT_LIST list(JOB_PMC_STANDARD, JOB_PMC_ENGINEER, JOB_PMC_MEDIC, JOB_PMC_INVESTIGATOR, JOB_PMC_DETAINER, JOB_PMC_ELITE, JOB_PMC_GUNNER, JOB_PMC_SNIPER, JOB_PMC_CREWMAN, JOB_PMC_NINJA, JOB_PMC_XENO_HANDLER, JOB_PMC_COMMANDO, JOB_PMC_LEADER, JOB_PMC_LEAD_INVEST)
 
 //-------- WY --------//
 

code/__DEFINES/layers.dm

@@ -124,12 +124,15 @@
 #define FACEHUGGER_LAYER 4.13
 /// For WEATHER
 #define WEATHER_LAYER 4.14
-#define INTERIOR_WALL_SOUTH_LAYER 5.2
-#define INTERIOR_DOOR_LAYER 5.21
 
 //#define FLY_LAYER 5
 
 #define RIPPLE_LAYER 5.1
+#define INTERIOR_DOOR_INSIDE_LAYER 5.19
+#define INTERIOR_WALL_SOUTH_LAYER 5.2
+#define INTERIOR_DOOR_LAYER 5.21
+#define INTERIOR_WALLMOUNT_LAYER 5.3
+#define INTERIOR_ROOF_LAYER 5.5
 
 #define ABOVE_FLY_LAYER 6
 
@@ -174,9 +177,12 @@
 /// NEVER HAVE ANYTHING BELOW THIS PLANE ADJUST IF YOU NEED MORE SPACE
 #define LOWEST_EVER_PLANE -200
 
+/// Floor plane, self explanatory. Used for Ambient Occlusion filter
 #define FLOOR_PLANE -7
+/// Game Plane, where most of the game objects reside
 #define GAME_PLANE -6
-#define ABOVE_GAME_PLANE -5
+/// Roof plane, disappearing when entering buildings
+#define ROOF_PLANE -4
 
 /// To keep from conflicts with SEE_BLACKNESS internals
 #define BLACKNESS_PLANE 0

code/__DEFINES/maps.dm

@@ -104,8 +104,10 @@ require only minor tweaks.
 #define GROUND_MAP "ground_map"
 #define SHIP_MAP "ship_map"
 #define ALL_MAPTYPES list(GROUND_MAP, SHIP_MAP)
+#define OVERRIDE_MAPS_TO_FILENAME list(GROUND_MAP = "next_map_override.dmm", SHIP_MAP = "next_ship_override.dmm")
 #define MAP_TO_FILENAME list(GROUND_MAP = "data/next_map.json", SHIP_MAP = "data/next_ship.json")
 #define HUNTERSHIPS_TEMPLATE_PATH "maps/predship/huntership.dmm"
+#define OVERRIDE_DEFAULT_MAP_CONFIG list(GROUND_MAP = "maps/override_ground.json", SHIP_MAP = "maps/override_ship.json")
 
 // traity things
 #define MAP_COLD "COLD"