mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-14 00:26:02 +01:00
Merge pull request #16360 from ShadowLarkens/mapci
Make map selection marginally better and more CI friendly
This commit is contained in:
Heroman3003
+26
-23
@@ -67,7 +67,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Cache SpacemanDMM
|
||||
- name: Restore SpacemanDMM Cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/SpacemanDMM
|
||||
@@ -92,7 +92,7 @@ jobs:
|
||||
unit_tests:
|
||||
strategy:
|
||||
matrix:
|
||||
map: ['tether', 'stellar_delight', 'groundbase']
|
||||
map: ['USE_MAP_TETHER', 'USE_MAP_STELLARDELIGHT', 'USE_MAP_GROUNDBASE']
|
||||
# name: Integration Tests (${{ matrix.map }})
|
||||
name: Integration Tests
|
||||
# needs: ['run_linters', 'dreamchecker']
|
||||
@@ -102,10 +102,10 @@ jobs:
|
||||
- name: Ensure +x on CI directory
|
||||
run: |
|
||||
chmod -R +x ./tools/ci
|
||||
- name: Setup Cache
|
||||
- name: Restore BYOND Cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: $HOME/BYOND
|
||||
path: $HOME/byond
|
||||
key: ${{ runner.os }}-byond
|
||||
- name: Install RUST_G Dependencies
|
||||
run: |
|
||||
@@ -118,35 +118,38 @@ jobs:
|
||||
tools/ci/install_byond.sh
|
||||
tools/ci/compile_and_run.sh
|
||||
env:
|
||||
TEST_DEFINE: "UNIT_TEST"
|
||||
TEST_FILE: "code/_unit_tests.dm"
|
||||
MAP: ${{ matrix.map }}
|
||||
REPLACE: true
|
||||
EXTRA_ARGS: "-DUNIT_TEST -D${{ matrix.map }}"
|
||||
RUN: "1"
|
||||
- name: Compile POIs
|
||||
|
||||
extra_map_tests:
|
||||
name: Map Tests
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Ensure +x on CI directory
|
||||
run: |
|
||||
tools/ci/install_byond.sh
|
||||
tools/ci/compile_and_run.sh
|
||||
chmod -R +x ./tools/ci
|
||||
- name: Restore BYOND Cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: $HOME/byond
|
||||
key: ${{ runner.os }}-byond
|
||||
- name: Install BYOND
|
||||
run: tools/ci/install_byond.sh
|
||||
- name: Compile POIs
|
||||
run: tools/ci/compile_and_run.sh
|
||||
env:
|
||||
TEST_DEFINE: "MAP_TEST"
|
||||
TEST_FILE: "code/_map_tests.dm"
|
||||
MAP: ${{ matrix.map }}
|
||||
REPLACE: false
|
||||
EXTRA_ARGS: "-DMAP_TEST"
|
||||
RUN: "0"
|
||||
- name: Compile away missions
|
||||
run: |
|
||||
tools/ci/install_byond.sh
|
||||
tools/ci/compile_and_run.sh
|
||||
run: tools/ci/compile_and_run.sh
|
||||
env:
|
||||
TEST_DEFINE: "AWAY_MISSION_TEST"
|
||||
TEST_FILE: "code/_away_mission_tests.dm"
|
||||
MAP: ${{ matrix.map }}
|
||||
REPLACE: false
|
||||
EXTRA_ARGS: "-DAWAY_MISSION_TEST -DUSE_MAP_TETHER" # Only Tether has support for all away missions
|
||||
RUN: "0"
|
||||
|
||||
tests_successful:
|
||||
name: Integration Tests
|
||||
needs: ['run_linters', 'dreamchecker', 'unit_tests']
|
||||
needs: ['run_linters', 'dreamchecker', 'unit_tests', 'extra_map_tests']
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Report Success
|
||||
|
||||
@@ -15,11 +15,16 @@
|
||||
// Movement Compile Options
|
||||
//#define CARDINAL_INPUT_ONLY // Uncomment to disable diagonal player movement (restore previous cardinal-moves-only behavior)
|
||||
|
||||
// CI will override these as appropriate
|
||||
// #define MAP_TEST 0
|
||||
// #define AWAY_MISSION_TEST 0
|
||||
// #define UNIT_TEST 0
|
||||
|
||||
// Comment/Uncomment this to turn off/on shuttle code debugging logs
|
||||
#define DEBUG_SHUTTLES
|
||||
|
||||
// If we are doing the map test build, do not include the main maps, only the submaps.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#define USING_MAP_DATUM /datum/map
|
||||
#define MAP_OVERRIDE 1
|
||||
#endif
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
/*
|
||||
*
|
||||
* This file is used by CI to indicate that additional maps need to be compiled to look for errors such as missing paths.
|
||||
* Do not add anything but the AWAY_MISSION_TEST definition here as it will be overwritten by CI when running tests.
|
||||
*
|
||||
*
|
||||
* Should you wish to edit set AWAY_MISSION_TEST to 1 like so:
|
||||
* #define AWAY_MISSION_TEST 1
|
||||
*/
|
||||
#define AWAY_MISSION_TEST 0
|
||||
@@ -1,10 +0,0 @@
|
||||
/*
|
||||
*
|
||||
* This file is used by CI to indicate that additional maps need to be compiled to look for errors such as missing paths.
|
||||
* Do not add anything but the MAP_TEST definition here as it will be overwritten by CI when running tests.
|
||||
*
|
||||
*
|
||||
* Should you wish to edit set MAP_TEST to 1 like so:
|
||||
* #define MAP_TEST 1
|
||||
*/
|
||||
#define MAP_TEST 0
|
||||
@@ -1,10 +0,0 @@
|
||||
/*
|
||||
*
|
||||
* This file is used by CI to indicate that Unit Tests are to be ran.
|
||||
* Do not add anything but the UNIT_TEST definition here as it will be overwritten by CI when running tests.
|
||||
*
|
||||
*
|
||||
* Should you wish to edit set UNIT_TEST to 1 like so:
|
||||
* #define UNIT_TEST 1
|
||||
*/
|
||||
#define UNIT_TEST 0
|
||||
+2
-2
@@ -56,7 +56,7 @@
|
||||
|
||||
. = ..()
|
||||
|
||||
#if UNIT_TEST
|
||||
#ifdef UNIT_TEST
|
||||
log_unit_test("Unit Tests Enabled. This will destroy the world when testing is complete.")
|
||||
log_unit_test("If you did not intend to enable this please check code/__defines/unit_testing.dm")
|
||||
#endif
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
spawn(1)
|
||||
master_controller.setup()
|
||||
#if UNIT_TEST
|
||||
#ifdef UNIT_TEST
|
||||
initialize_unit_tests()
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
/proc/createRandomZlevel()
|
||||
if(awaydestinations.len || UNIT_TEST) //crude, but it saves another var! //VOREStation Edit - No loading away missions during CI testing
|
||||
#ifdef UNIT_TEST
|
||||
return
|
||||
#endif
|
||||
if(awaydestinations.len) //crude, but it saves another var! //VOREStation Edit - No loading away missions during CI testing
|
||||
return
|
||||
|
||||
var/list/potentialRandomZlevels = list()
|
||||
|
||||
@@ -44,7 +44,7 @@ mappath = 'tether_plains.dmm'
|
||||
# Non-map specific expedition areas should be loaded as follows:
|
||||
|
||||
/// Away Missions
|
||||
#if AWAY_MISSION_TEST
|
||||
#ifdef AWAY_MISSION_TEST
|
||||
#include "../../expedition_vr/beach/beach.dmm"
|
||||
#include "../../expedition_vr/beach/cave.dmm"
|
||||
#include "../../expedition_vr/alienship/alienship.dmm"
|
||||
@@ -65,4 +65,4 @@ mappath = 'tether_plains.dmm'
|
||||
/datum/map_z_level/tether_lateload/away_beach
|
||||
name = "Away Mission - Desert Beach"
|
||||
z = Z_LEVEL_BEACH
|
||||
base_turf = /turf/simulated/floor/outdoors/rocks/caves
|
||||
base_turf = /turf/simulated/floor/outdoors/rocks/caves
|
||||
|
||||
@@ -442,7 +442,7 @@ ESCAPE_POD(1)
|
||||
|
||||
/*
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "generic_shuttle.dmm"
|
||||
#endif
|
||||
|
||||
@@ -496,4 +496,4 @@ ESCAPE_POD(1)
|
||||
vessel_mass = 1000
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
shuttle = "Private Vessel"
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "deadBeacon.dmm"
|
||||
#include "prepper1.dmm"
|
||||
#include "quarantineshuttle.dmm"
|
||||
@@ -371,4 +371,3 @@
|
||||
mappath = 'maps/expedition_vr/beach/submaps/speakeasy_vr.dmm'
|
||||
cost = 10
|
||||
allow_duplicates = FALSE
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "..\offmap_vr\common_offmaps.dm"
|
||||
#include "..\~map_system\maps_vr.dm"
|
||||
|
||||
#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
|
||||
#ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
|
||||
#include "gb-z1.dmm"
|
||||
#include "gb-z2.dmm"
|
||||
#include "gb-z3.dmm"
|
||||
@@ -24,4 +24,4 @@
|
||||
|
||||
#warn A map has already been included, ignoring Groundbase
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "pois/outdoors1.dmm"
|
||||
#include "pois/outdoors2.dmm"
|
||||
#include "pois/outdoors3.dmm"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/// Away Missions
|
||||
#if AWAY_MISSION_TEST
|
||||
#ifdef AWAY_MISSION_TEST
|
||||
#include "../expedition_vr/beach/beach.dmm"
|
||||
#include "../expedition_vr/beach/cave.dmm"
|
||||
#include "../expedition_vr/alienship/alienship.dmm"
|
||||
@@ -358,7 +358,7 @@
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
// Admin-use z-levels for loading whenever an admin feels like
|
||||
#if AWAY_MISSION_TEST
|
||||
#ifdef AWAY_MISSION_TEST
|
||||
#include "../submaps/admin_use_vr/spa.dmm"
|
||||
#endif
|
||||
#include "../submaps/admin_use_vr/fun.dm"
|
||||
@@ -616,7 +616,7 @@
|
||||
#include "../offmap_vr/talon/talon_v2.dm"
|
||||
#include "../offmap_vr/talon/talon_v2_areas.dm"
|
||||
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "../offmap_vr/talon/talon_v2.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "abductor.dmm"
|
||||
#endif
|
||||
|
||||
@@ -85,4 +85,3 @@ You will find a dispenser within the room you started in which contains some bas
|
||||
/obj/machinery/power/rtg/abductor/built/abductor
|
||||
name = "Void Core"
|
||||
power_gen = 5000000
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "aro.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "aro2.dmm"
|
||||
#endif
|
||||
|
||||
@@ -100,4 +100,4 @@
|
||||
docking_controller_tag = "aroboat2_docker"
|
||||
shuttle_area = /area/shuttle/aroboat2
|
||||
fuel_consumption = 0
|
||||
defer_initialisation = TRUE
|
||||
defer_initialisation = TRUE
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "aro3.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "bearcat.dmm"
|
||||
#endif
|
||||
|
||||
@@ -199,4 +199,4 @@
|
||||
/area/shuttle/bearcat/comms
|
||||
name = "\improper Bearcat Communications Relay"
|
||||
icon_state = "tcomsatcham"
|
||||
music = list('sound/ambience/signal.ogg')
|
||||
music = list('sound/ambience/signal.ogg')
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "curashuttle.dmm"
|
||||
#endif
|
||||
|
||||
@@ -63,4 +63,4 @@
|
||||
[b]Notice[/b]: Small private vessel"}
|
||||
vessel_mass = 2000
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
shuttle = "Cura"
|
||||
shuttle = "Cura"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "gecko_sh.dmm"
|
||||
#include "gecko_cr.dmm"
|
||||
#endif
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "generic_shuttle.dmm"
|
||||
#endif
|
||||
|
||||
@@ -52,4 +52,4 @@
|
||||
[b]Notice[/b]: Small private vessel"}
|
||||
vessel_mass = 1000
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
shuttle = "Private Vessel"
|
||||
shuttle = "Private Vessel"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "hybridshuttle.dmm"
|
||||
#endif
|
||||
|
||||
@@ -49,4 +49,4 @@
|
||||
[b]Notice[/b]: Experimental vessel"}
|
||||
vessel_mass = 3000
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "XN-29 Prototype Shuttle"
|
||||
shuttle = "XN-29 Prototype Shuttle"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "itglight.dmm"
|
||||
#endif
|
||||
|
||||
@@ -149,4 +149,4 @@
|
||||
She has six point defense turrets, but her armor is thin, and she hasn't got any fancy shields. <br>
|
||||
She's not a combat ship, and she demands a competent pilot to treat her right.<br><br>
|
||||
Also d1a2 is best port, just saying.<br><br>
|
||||
Also the ship is 150 meters long and 92 meters wide, in case that is ever relevent."}
|
||||
Also the ship is 150 meters long and 92 meters wide, in case that is ever relevent."}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "lunaship.dmm"
|
||||
#endif
|
||||
|
||||
@@ -97,4 +97,4 @@
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
initial_generic_waypoints = list("luna_near_fore_port", "luna_near_fore_star", "luna_near_aft_port", "luna_near_aft_star", "luna_near_fore", "luna_wing_port", "luna_wing_star", "luna_near_aft")
|
||||
fore_dir = NORTH
|
||||
known = FALSE
|
||||
known = FALSE
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "mackerel_sh.dmm"
|
||||
#include "mackerel_lc.dmm"
|
||||
#include "mackerel_lc_wreck.dmm"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "mercenarybase.dmm"
|
||||
#endif
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
/area/mercbase/dock
|
||||
name = "\improper Mercenary Base Boat Dock"
|
||||
/area/mercbase/cafeteria
|
||||
name = "\improper Mercenary Base Boat Cafeteria"
|
||||
name = "\improper Mercenary Base Boat Cafeteria"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "mercship.dmm"
|
||||
#endif
|
||||
|
||||
@@ -105,4 +105,4 @@
|
||||
docking_controller_tag = "mercboat_docker"
|
||||
shuttle_area = /area/shuttle/mercboat
|
||||
fuel_consumption = 0
|
||||
defer_initialisation = TRUE
|
||||
defer_initialisation = TRUE
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "salamander.dmm"
|
||||
#endif
|
||||
|
||||
@@ -207,4 +207,4 @@ stay safe out there and always double check who you sign with<br>\
|
||||
<br>\
|
||||
rest of the cargo is covered by insurance anyway, so help yourself/ves i guess<br>\
|
||||
<br>\
|
||||
-M"}
|
||||
-M"}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "screebarge.dmm"
|
||||
#endif
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
desc = "Some sort of makeshift battle barge. Appears to be armed."
|
||||
vessel_mass = 3000
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Battle Barge"
|
||||
shuttle = "Battle Barge"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "sdf_corvette.dmm"
|
||||
#include "sdf_corvette_wreck.dmm"
|
||||
#include "sdf_cutter.dmm"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "shelter_5.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "vespa.dmm"
|
||||
#endif
|
||||
|
||||
@@ -159,4 +159,4 @@
|
||||
//docking_controller_tag = "vespaboat_docker"
|
||||
//shuttle_area = /area/shuttle/vespaboat
|
||||
//fuel_consumption = 0
|
||||
//defer_initialisation = TRUE
|
||||
//defer_initialisation = TRUE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "pois/darkstar.dmm"
|
||||
#include "pois/darktear1.dmm"
|
||||
#include "pois/darktear2.dmm"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "..\offmap_vr\common_offmaps.dm"
|
||||
#include "..\tether\tether_jobs.dm"
|
||||
|
||||
#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
|
||||
#ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
|
||||
#include "stellar_delight1.dmm"
|
||||
#include "stellar_delight2.dmm"
|
||||
#include "stellar_delight3.dmm"
|
||||
@@ -23,4 +23,4 @@
|
||||
|
||||
#warn A map has already been included, ignoring Tether
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "ert.dmm"
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
/area/ship/ert/engineering
|
||||
name = "\improper NRV Von Braun - Engineering Control Room"
|
||||
icon_state = "engine_monitoring"
|
||||
|
||||
|
||||
/area/ship/ert/eng_storage
|
||||
name = "\improper NRV Von Braun - Engineering Storage"
|
||||
icon_state = "storage"
|
||||
@@ -36,7 +36,7 @@
|
||||
/area/ship/ert/atmos
|
||||
name = "\improper NRV Von Braun - Atmospherics"
|
||||
icon_state = "atmos"
|
||||
|
||||
|
||||
/area/ship/ert/mech_bay
|
||||
name = "\improper NRV Von Braun - RIG & Mech Bay"
|
||||
icon_state = "yellow"
|
||||
@@ -184,7 +184,7 @@
|
||||
on_enter_occupant_message = "You feel cool air surround you. You go numb as your senses turn inward."
|
||||
on_store_visible_message_1 = "hums and hisses as it moves"
|
||||
on_store_visible_message_2 = "into cryogenic storage."
|
||||
|
||||
|
||||
//Misc Stuff
|
||||
/obj/item/paper/ert_armory_cells
|
||||
name = "ERT Armory Cell Supply"
|
||||
@@ -236,4 +236,4 @@ P.S. Before any of you ask, no, you cannot fire yourself or your teammates out o
|
||||
|
||||
storage_type = "responders"
|
||||
storage_name = "ERT Oversight Control"
|
||||
allow_items = 1
|
||||
allow_items = 1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "event_autonomous_drone.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "mercship.dmm"
|
||||
#endif
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/area/ship/manta/atmos
|
||||
name = "\improper Mercenary Cruiser - Atmospherics"
|
||||
icon_state = "atmos"
|
||||
|
||||
|
||||
/area/ship/manta/mech_bay
|
||||
name = "\improper Mercenary Cruiser - Mech Bay"
|
||||
icon_state = "mechbay"
|
||||
@@ -100,19 +100,19 @@
|
||||
/area/ship/manta/commander
|
||||
name = "\improper Mercenary Cruiser - Commander's Room"
|
||||
icon_state = "head_quarters"
|
||||
|
||||
|
||||
/area/ship/manta/holding
|
||||
name = "\improper Mercenary Cruiser - Holding Cells"
|
||||
icon_state = "brig"
|
||||
|
||||
|
||||
/area/ship/manta/recreation
|
||||
name = "\improper Mercenary Cruiser - Recreation & Supplies"
|
||||
icon_state = "recreation_area"
|
||||
|
||||
|
||||
/area/ship/manta/gunnery
|
||||
name = "\improper Mercenary Cruiser - Gunnery"
|
||||
icon_state = "security_sub"
|
||||
|
||||
|
||||
/area/ship/manta/magazine
|
||||
name = "\improper Mercenary Cruiser - Cannon Magazine"
|
||||
icon_state = "darkred"
|
||||
@@ -218,7 +218,7 @@
|
||||
on_enter_occupant_message = "You feel cool air surround you. You go numb as your senses turn inward."
|
||||
on_store_visible_message_1 = "hums and hisses as it moves"
|
||||
on_store_visible_message_2 = "into cryogenic storage."
|
||||
|
||||
|
||||
//Misc Stuff
|
||||
/obj/item/paper/manta_shields
|
||||
name = "Shield Setup"
|
||||
@@ -296,4 +296,4 @@ In the meantime, happy hunting. Go bag me some carp. The mech bay can be found i
|
||||
|
||||
storage_type = "mercenaries"
|
||||
storage_name = "Merc Oversight Control"
|
||||
allow_items = 1
|
||||
allow_items = 1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "salamander_trader.dmm"
|
||||
#endif
|
||||
|
||||
@@ -25,28 +25,28 @@
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_q1
|
||||
/area/shuttle/salamander_trader_q1
|
||||
name = "\improper Salamander Trader Quarters 1"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-p"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_q2
|
||||
/area/shuttle/salamander_trader_q2
|
||||
name = "\improper Salamander Trader Quarters 2"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-s"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_galley
|
||||
/area/shuttle/salamander_trader_galley
|
||||
name = "\improper Salamander Trader Galley"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "dark-s"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_head
|
||||
/area/shuttle/salamander_trader_head
|
||||
name = "\improper Salamander Trader Head"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "dark-p"
|
||||
@@ -87,4 +87,4 @@
|
||||
vessel_mass = 4500
|
||||
vessel_size = SHIP_SIZE_LARGE
|
||||
fore_dir = EAST
|
||||
shuttle = "Salamander Trader"
|
||||
shuttle = "Salamander Trader"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new engine, please add it to this list.
|
||||
// Polaris: R-UST and Singulo are commented out as their current submap does not line up with the control room.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
// #include "engine_rust.dmm"
|
||||
// #include "engine_singulo.dmm"
|
||||
#include "engine_sme.dmm"
|
||||
@@ -33,4 +33,4 @@
|
||||
/datum/map_template/engine/tesla
|
||||
name = "Edison's Bane"
|
||||
desc = "The Telsa Engine"
|
||||
mappath = 'maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm'
|
||||
mappath = 'maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes engine maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new engine, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "engine_rust.dmm"
|
||||
#include "engine_singulo.dmm"
|
||||
#include "engine_sme.dmm"
|
||||
@@ -32,4 +32,4 @@
|
||||
/datum/map_template/engine/tesla
|
||||
name = "Edison's Bane"
|
||||
desc = "The Telsa Engine"
|
||||
mappath = 'maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm'
|
||||
mappath = 'maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "virgo2_submap_areas.dm"
|
||||
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "Flake.dmm"
|
||||
#include "MCamp1.dmm"
|
||||
#include "Rocky1.dmm"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "bittynest1.dmm"
|
||||
#include "bittynest2.dmm"
|
||||
#include "bittynest3.dmm"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
// #define "your_map_here.dmm"
|
||||
#endif
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
name = "Space Content - Debrisfield"
|
||||
desc = "Designed for space points of interest."
|
||||
|
||||
// No points of interest yet, but the infrastructure is there for people to add!
|
||||
// No points of interest yet, but the infrastructure is there for people to add!
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
// #define "your_map_here.dmm"
|
||||
#endif
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
name = "POI - Space Content"
|
||||
desc = "A map template base. In space."
|
||||
|
||||
// To be added: Templates for space exploration when they are made.
|
||||
// To be added: Templates for space exploration when they are made.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "deadBeacon.dmm"
|
||||
#include "prepper1.dmm"
|
||||
#include "quarantineshuttle.dmm"
|
||||
@@ -371,4 +371,3 @@
|
||||
mappath = 'maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm'
|
||||
cost = 10
|
||||
allow_duplicates = FALSE
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "farm1.dmm"
|
||||
#include "construction1.dmm"
|
||||
#include "camp1.dmm"
|
||||
@@ -338,7 +338,7 @@
|
||||
name = "Syndi Sniper"
|
||||
desc = "Syndicate watch tower, deadly but secluded"
|
||||
mappath = 'maps/submaps/surface_submaps/plains/syndisniper.dmm'
|
||||
|
||||
|
||||
cost = 5
|
||||
|
||||
/datum/map_template/surface/plains/drgnplateu
|
||||
@@ -346,4 +346,4 @@
|
||||
desc = "A dangerous plateu of cliffs home to a rampant gold hoarding dragon"
|
||||
mappath = 'maps/submaps/surface_submaps/plains/drgnplateu.dmm'
|
||||
cost = 15
|
||||
allow_duplicates = FALSE
|
||||
allow_duplicates = FALSE
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "farm1.dmm"
|
||||
#include "construction1.dmm"
|
||||
#include "camp1.dmm"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
|
||||
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
|
||||
// When adding a new PoI, please add it to this list.
|
||||
#if MAP_TEST
|
||||
#ifdef MAP_TEST
|
||||
#include "spider1.dmm"
|
||||
#include "Flake.dmm"
|
||||
#include "MCamp1.dmm"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "tether_events.dm"
|
||||
#include "../offmap_vr/common_offmaps.dm"
|
||||
|
||||
#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
|
||||
#ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
|
||||
#include "tether-01-surface1.dmm"
|
||||
#include "tether-02-surface2.dmm"
|
||||
#include "tether-03-surface3.dmm"
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
#ifndef CITESTING
|
||||
|
||||
/*********************/
|
||||
/* MAP SELECTION */
|
||||
/* FOR LIVE SERVER */
|
||||
/*********************/
|
||||
|
||||
// #define USE_MAP_TETHER
|
||||
#define USE_MAP_STELLARDELIGHT
|
||||
// #define USE_MAP_GROUNDBASE
|
||||
|
||||
// Debug
|
||||
// #define USE_MAP_MINITEST
|
||||
|
||||
/*********************/
|
||||
/* End Map Selection */
|
||||
/*********************/
|
||||
|
||||
#endif
|
||||
|
||||
// Tether
|
||||
#ifdef USE_MAP_TETHER
|
||||
#include "../tether/tether.dm"
|
||||
#endif
|
||||
|
||||
// Stellar Delight
|
||||
#ifdef USE_MAP_STELLARDELIGHT
|
||||
#include "../stellar_delight/stellar_delight.dm"
|
||||
#endif
|
||||
|
||||
// Groundbase
|
||||
#ifdef USE_MAP_GROUNDBASE
|
||||
#include "../groundbase/groundbase.dm"
|
||||
#endif
|
||||
|
||||
#ifdef USE_MAP_MINITEST
|
||||
#include "../virgo_minitest/virgo_minitest.dm"
|
||||
#endif
|
||||
@@ -5,43 +5,19 @@ NC='\033[0m'
|
||||
|
||||
source $HOME/BYOND/byond/bin/byondsetup
|
||||
|
||||
# Clean up between steps so Juke doesn't refuse to recompile with different -D options
|
||||
rm vorestation.dmb
|
||||
|
||||
# Copy example configs
|
||||
cp config/example/* config/
|
||||
|
||||
# Define any unit test defines that need to run
|
||||
echo "#define ${TEST_DEFINE} 1" > ${TEST_FILE}
|
||||
|
||||
replace=${REPLACE}
|
||||
# Messy map compile code
|
||||
if grep -q '#include[[:space:]]\"maps\\tether\\tether.dm\"' $BASENAME.dme && $replace; then
|
||||
sed -i 's/#include[[:space:]]\"maps\\tether\\tether.dm\"/#include\ \"maps\\'${MAP}'\\'${MAP}'.dm\"/g' $BASENAME.dme
|
||||
replace=false
|
||||
elif grep -q '#include[[:space:]]\"maps\\stellar_delight\\stellar_delight.dm\"' $BASENAME.dme && $replace; then
|
||||
sed -i 's/#include[[:space:]]\"maps\\stellar_delight\\stellar_delight.dm\"/#include\ \"maps\\'${MAP}'\\'${MAP}'.dm\"/g' $BASENAME.dme
|
||||
replace=false
|
||||
elif grep -q '#include[[:space:]]\"maps\\groundbase\\groundbase.dm\"' $BASENAME.dme && $replace; then
|
||||
sed -i 's/#include[[:space:]]\"maps\\groundbase\\groundbase.dm\"/#include\ \"maps\\'${MAP}'\\'${MAP}'.dm\"/g' $BASENAME.dme
|
||||
replace=false
|
||||
fi
|
||||
|
||||
# Compile a copy of the codebase, and print errors as Github Actions annotations
|
||||
tools/build/build --ci dm -DCIBUILDING -DCITESTING
|
||||
tools/build/build --ci dm -DCIBUILDING -DCITESTING ${EXTRA_ARGS}
|
||||
exitVal=$?
|
||||
# if [ $exitVal -gt 0 ]; then
|
||||
# sed -E -n 's/^(.+?\.dm):([0-9]+):(error|warning): (.+)$/::\3 file=\1,line=\2::\4/gp'
|
||||
# fi
|
||||
|
||||
# Compile failed on map_test
|
||||
if [ $exitVal -gt 0 ] && [ $TEST_DEFINE = "MAP_TEST" ]; then
|
||||
echo "${RED}Some POIs appear to contain map-specific objects or code. Please isolate map-specific items/code from POIs.${NC}"
|
||||
exit 1
|
||||
# Compile failed on away_mission_test
|
||||
elif [ $exitVal -gt 0 ] && [ $TEST_DEFINE = "AWAY_MISSION_TEST" ]; then
|
||||
echo "${RED}Some away missions failed to compile. Please check them for missing items/objects by trying to compile them in DreamMaker.${NC}"
|
||||
exit 1
|
||||
# Compile failed on unit_test
|
||||
elif [ $exitVal -gt 0 ] && [ $TEST_DEFINE = "UNIT_TEST" ]; then
|
||||
echo "${RED}Compiling the codebase normally failed. Please review the compile errors and correct them, usually before making your PR.${NC}"
|
||||
if [ $exitVal -gt 0 ]; then
|
||||
echo "${RED}Errors were produced during CI with arguments ${EXTRA_ARGS}, please review CI logs.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
+1
-4
@@ -12,11 +12,8 @@
|
||||
// BEGIN_INCLUDE
|
||||
#include "code\__byond_version_compat.dm"
|
||||
#include "code\__spaceman_dmm.dm"
|
||||
#include "code\_away_mission_tests.dm"
|
||||
#include "code\_macros.dm"
|
||||
#include "code\_macros_vr.dm"
|
||||
#include "code\_map_tests.dm"
|
||||
#include "code\_unit_tests.dm"
|
||||
#include "code\global.dm"
|
||||
#include "code\global_init.dm"
|
||||
#include "code\global_vr.dm"
|
||||
@@ -4353,7 +4350,6 @@
|
||||
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
|
||||
#include "maps\southern_cross\items\clothing\sc_suit.dm"
|
||||
#include "maps\southern_cross\items\clothing\sc_under.dm"
|
||||
#include "maps\stellar_delight\stellar_delight.dm"
|
||||
#include "maps\submaps\_helpers.dm"
|
||||
#include "maps\submaps\_readme.dm"
|
||||
#include "maps\submaps\admin_use_vr\event_autonomous_drone.dm"
|
||||
@@ -4364,5 +4360,6 @@
|
||||
#include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
|
||||
#include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
|
||||
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
|
||||
#include "maps\~map_system\_map_selection.dm"
|
||||
#include "maps\~map_system\maps.dm"
|
||||
// END_INCLUDE
|
||||
|
||||
Reference in New Issue
Block a user