From 2f77f782f14c71a96d196aa6323f51326cc0873a Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sun, 12 Apr 2020 14:56:02 +0100 Subject: [PATCH] Take 3 --- .travis.yml | 2 +- _maps/travis_map_testing.dm | 270 +++++++++++++++++++----------------- code/datums/spells/mime.dm | 2 +- 3 files changed, 143 insertions(+), 131 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4182ad8ea6a..2e12830ab8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,4 @@ matrix: - tools/travis/install_byond.sh - source $HOME/BYOND/byond/bin/byondsetup script: - - tools/travis/dm.sh -M travis_map_testing paradise.dme + - tools/travis/dm.sh -Mtravis_map_testing paradise.dme diff --git a/_maps/travis_map_testing.dm b/_maps/travis_map_testing.dm index 94bd9bac437..89fc4ec49ce 100644 --- a/_maps/travis_map_testing.dm +++ b/_maps/travis_map_testing.dm @@ -1,144 +1,156 @@ // This is for Travis testing. DO NOT SET THIS AS THE GAME'S MAP NORMALLY! #if !defined(USING_MAP_DATUM) - // Away missions - #include "map_files\RandomZLevels\academy.dmm" - #include "map_files\RandomZLevels\beach.dmm" - #include "map_files\RandomZLevels\blackmarketpackers.dmm" - #include "map_files\RandomZLevels\centcomAway.dmm" - #include "map_files\RandomZLevels\evil_santa.dmm" - #include "map_files\RandomZLevels\example.dmm" - #include "map_files\RandomZLevels\moonoutpost19.dmm" - #include "map_files\RandomZLevels\spacebattle.dmm" - #include "map_files\RandomZLevels\spacehotel.dmm" - #include "map_files\RandomZLevels\stationCollision.dmm" - #include "map_files\RandomZLevels\terrorspiders.dmm" - #include "map_files\RandomZLevels\undergroundoutpost45.dmm" - #include "map_files\RandomZLevels\wildwest.dmm" + // Cyberiad + #include "map_files/Cyberiad/cyberiad.dmm" + #include "map_files/Cyberiad/z2.dmm" + #include "map_files/Cyberiad/z3.dmm" + #include "map_files/Cyberiad/z4.dmm" + #include "map_files/Cyberiad/z6.dmm" + // Debug Maps + #include "map_files/Debug/singletile.dmm" + #include "map_files/Debug/smoothing.dmm" + + // Delta + #include "map_files/Delta/delta.dmm" + + // Generic Z Levels + #include "map_files/Generic/Lavaland.dmm" + #include "map_files/Generic/z6.dmm" + #include "map_files/Generic/z7.dmm" + + // MetaStation + #include "map_files/MetaStation/MetaStation.v41A.II.dmm" + #include "map_files/MetaStation/z2.dmm" + #include "map_files/MetaStation/z3.dmm" + #include "map_files/MetaStation/z4.dmm" // Lavaland Ruins - #include "map_files\RandomRuins\LavaRuins\lavaland_biodome_beach.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_biodome_clown_planet.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_biodome_winter.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_animal_hospital.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_ash_walker1.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_blooddrunk1.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_blooddrunk2.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_blooddrunk3.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_cube.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_cultaltar.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_dead_ratvar.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_envy.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_fountain_hall.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_gluttony.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_greed.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_hermit.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_hierophant.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_pizzaparty.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_pride.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_puzzle.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_random_ripley.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_seed_vault.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_sloth.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_survivalpod.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_swarmer_crash.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_syndicate_base1.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_ufo_crash.dmm" - #include "map_files\RandomRuins\LavaRuins\lavaland_surface_xeno_nest.dmm" - + #include "map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm" + #include "map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm" // Space Ruins - #include "map_files\RandomRuins\SpaceRuins\abandonedzoo.dmm" - #include "map_files\RandomRuins\SpaceRuins\asteroid1.dmm" - #include "map_files\RandomRuins\SpaceRuins\asteroid2.dmm" - #include "map_files\RandomRuins\SpaceRuins\asteroid3.dmm" - #include "map_files\RandomRuins\SpaceRuins\asteroid4.dmm" - #include "map_files\RandomRuins\SpaceRuins\asteroid5.dmm" - #include "map_files\RandomRuins\SpaceRuins\deepstorage.dmm" - #include "map_files\RandomRuins\SpaceRuins\derelict1.dmm" - #include "map_files\RandomRuins\SpaceRuins\derelict2.dmm" - #include "map_files\RandomRuins\SpaceRuins\derelict3.dmm" - #include "map_files\RandomRuins\SpaceRuins\derelict4.dmm" - #include "map_files\RandomRuins\SpaceRuins\derelict5.dmm" - #include "map_files\RandomRuins\SpaceRuins\emptyshell.dmm" - #include "map_files\RandomRuins\SpaceRuins\gasthelizards.dmm" - #include "map_files\RandomRuins\SpaceRuins\intactemptyship.dmm" - #include "map_files\RandomRuins\SpaceRuins\listeningpost.dmm" - #include "map_files\RandomRuins\SpaceRuins\mechtransport.dmm" - #include "map_files\RandomRuins\SpaceRuins\oldstation.dmm" - #include "map_files\RandomRuins\SpaceRuins\onehalf.dmm" - #include "map_files\RandomRuins\SpaceRuins\spacebar.dmm" - #include "map_files\RandomRuins\SpaceRuins\turretedoutpost.dmm" - #include "map_files\RandomRuins\SpaceRuins\way_home.dmm" + #include "map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm" + #include "map_files/RandomRuins/SpaceRuins/asteroid1.dmm" + #include "map_files/RandomRuins/SpaceRuins/asteroid2.dmm" + #include "map_files/RandomRuins/SpaceRuins/asteroid3.dmm" + #include "map_files/RandomRuins/SpaceRuins/asteroid4.dmm" + #include "map_files/RandomRuins/SpaceRuins/asteroid5.dmm" + #include "map_files/RandomRuins/SpaceRuins/deepstorage.dmm" + #include "map_files/RandomRuins/SpaceRuins/derelict1.dmm" + #include "map_files/RandomRuins/SpaceRuins/derelict2.dmm" + #include "map_files/RandomRuins/SpaceRuins/derelict3.dmm" + #include "map_files/RandomRuins/SpaceRuins/derelict4.dmm" + #include "map_files/RandomRuins/SpaceRuins/derelict5.dmm" + #include "map_files/RandomRuins/SpaceRuins/emptyshell.dmm" + #include "map_files/RandomRuins/SpaceRuins/gasthelizards.dmm" + #include "map_files/RandomRuins/SpaceRuins/intactemptyship.dmm" + #include "map_files/RandomRuins/SpaceRuins/listeningpost.dmm" + #include "map_files/RandomRuins/SpaceRuins/mechtransport.dmm" + #include "map_files/RandomRuins/SpaceRuins/oldstation.dmm" + #include "map_files/RandomRuins/SpaceRuins/onehalf.dmm" + #include "map_files/RandomRuins/SpaceRuins/spacebar.dmm" + #include "map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm" + #include "map_files/RandomRuins/SpaceRuins/way_home.dmm" + #include "map_files/RandomRuins/SpaceRuins/wizardcrash.dmm" + // Gateway Missions + #include "map_files/RandomZLevels/academy.dmm" + #include "map_files/RandomZLevels/beach.dmm" + #include "map_files/RandomZLevels/blackmarketpackers.dmm" + #include "map_files/RandomZLevels/centcomAway.dmm" + #include "map_files/RandomZLevels/evil_santa.dmm" + #include "map_files/RandomZLevels/example.dmm" + #include "map_files/RandomZLevels/moonoutpost19.dmm" + #include "map_files/RandomZLevels/spacebattle.dmm" + #include "map_files/RandomZLevels/spacehotel.dmm" + #include "map_files/RandomZLevels/stationCollision.dmm" + #include "map_files/RandomZLevels/terrorspiders.dmm" + #include "map_files/RandomZLevels/undergroundoutpost45.dmm" + #include "map_files/RandomZLevels/wildwest.dmm" - // Shuttle Templates - #include "map_files\shuttles\cargo_base.dmm" - #include "map_files\shuttles\emergency_bar.dmm" - #include "map_files\shuttles\emergency_clown.dmm" - #include "map_files\shuttles\emergency_cramped.dmm" - #include "map_files\shuttles\emergency_cyb.dmm" - #include "map_files\shuttles\emergency_dept.dmm" - #include "map_files\shuttles\emergency_meta.dmm" - #include "map_files\shuttles\emergency_mil.dmm" - #include "map_files\shuttles\emergency_narnar.dmm" - #include "map_files\shuttles\emergency_old.dmm" - #include "map_files\shuttles\ferry_base.dmm" - #include "map_files\shuttles\ferry_meat.dmm" + // Shuttles + #include "map_files/shuttles/admin_admin.dmm" + #include "map_files/shuttles/admin_hospital.dmm" + #include "map_files/shuttles/cargo_base.dmm" + #include "map_files/shuttles/emergency_bar.dmm" + #include "map_files/shuttles/emergency_clown.dmm" + #include "map_files/shuttles/emergency_cramped.dmm" + #include "map_files/shuttles/emergency_cyb.dmm" + #include "map_files/shuttles/emergency_dept.dmm" + #include "map_files/shuttles/emergency_meta.dmm" + #include "map_files/shuttles/emergency_mil.dmm" + #include "map_files/shuttles/emergency_narnar.dmm" + #include "map_files/shuttles/emergency_old.dmm" + #include "map_files/shuttles/ferry_base.dmm" + #include "map_files/shuttles/ferry_meat.dmm" - // Other templates - #include "map_files\templates\spacehotel\n_01.dmm" - #include "map_files\templates\spacehotel\n_02.dmm" - #include "map_files\templates\spacehotel\n_03.dmm" - #include "map_files\templates\spacehotel\n_04.dmm" - #include "map_files\templates\spacehotel\n_05.dmm" - #include "map_files\templates\spacehotel\n_06.dmm" - #include "map_files\templates\spacehotel\n_07.dmm" - #include "map_files\templates\spacehotel\n_08.dmm" - #include "map_files\templates\spacehotel\n_09.dmm" - #include "map_files\templates\spacehotel\n_10.dmm" - #include "map_files\templates\spacehotel\n_11.dmm" - #include "map_files\templates\spacehotel\n_12.dmm" - #include "map_files\templates\spacehotel\n_13.dmm" - #include "map_files\templates\spacehotel\n_14.dmm" - #include "map_files\templates\spacehotel\n_15.dmm" - #include "map_files\templates\spacehotel\n_16.dmm" - #include "map_files\templates\spacehotel\n_17.dmm" - #include "map_files\templates\spacehotel\n_18.dmm" - #include "map_files\templates\spacehotel\n_19.dmm" + // Templates + #include "map_files/templates/light_floor_1.dmm" + #include "map_files/templates/light_floor_2.dmm" + #include "map_files/templates/light_floor_3.dmm" + #include "map_files/templates/medium_shuttle1.dmm" + #include "map_files/templates/medium_shuttle2.dmm" + #include "map_files/templates/medium_shuttle3.dmm" + #include "map_files/templates/shelter_1.dmm" + #include "map_files/templates/shelter_2.dmm" + #include "map_files/templates/small_asteroid_1.dmm" + #include "map_files/templates/small_shuttle_1.dmm" - #include "map_files\templates\spacehotel\s_01.dmm" - #include "map_files\templates\spacehotel\s_02.dmm" - #include "map_files\templates\spacehotel\s_03.dmm" - #include "map_files\templates\spacehotel\s_04.dmm" - #include "map_files\templates\spacehotel\s_05.dmm" - #include "map_files\templates\spacehotel\s_06.dmm" - - #include "map_files\templates\light_floor_1.dmm" - #include "map_files\templates\light_floor_2.dmm" - #include "map_files\templates\light_floor_3.dmm" - #include "map_files\templates\medium_shuttle1.dmm" - #include "map_files\templates\medium_shuttle2.dmm" - #include "map_files\templates\medium_shuttle3.dmm" - #include "map_files\templates\shelter_1.dmm" - #include "map_files\templates\shelter_2.dmm" - #include "map_files\templates\small_asteroid_1.dmm" - #include "map_files\templates\small_shuttle_1.dmm" - - // This is pointless, we don't run the server - /*#define MAP_TRANSITION_CONFIG list(AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED, - AWAY_MISSION = UNAFFECTED) - - #define USING_MAP_DATUM /datum/map*/ + // Spacehotel Rooms + #include "map_files/templates/spacehotel/n_01.dmm" + #include "map_files/templates/spacehotel/n_02.dmm" + #include "map_files/templates/spacehotel/n_03.dmm" + #include "map_files/templates/spacehotel/n_04.dmm" + #include "map_files/templates/spacehotel/n_05.dmm" + #include "map_files/templates/spacehotel/n_06.dmm" + #include "map_files/templates/spacehotel/n_07.dmm" + #include "map_files/templates/spacehotel/n_08.dmm" + #include "map_files/templates/spacehotel/n_09.dmm" + #include "map_files/templates/spacehotel/n_10.dmm" + #include "map_files/templates/spacehotel/n_11.dmm" + #include "map_files/templates/spacehotel/n_12.dmm" + #include "map_files/templates/spacehotel/n_13.dmm" + #include "map_files/templates/spacehotel/n_14.dmm" + #include "map_files/templates/spacehotel/n_15.dmm" + #include "map_files/templates/spacehotel/n_16.dmm" + #include "map_files/templates/spacehotel/n_17.dmm" + #include "map_files/templates/spacehotel/n_18.dmm" + #include "map_files/templates/spacehotel/n_19.dmm" + #include "map_files/templates/spacehotel/s_01.dmm" + #include "map_files/templates/spacehotel/s_02.dmm" + #include "map_files/templates/spacehotel/s_03.dmm" + #include "map_files/templates/spacehotel/s_04.dmm" + #include "map_files/templates/spacehotel/s_05.dmm" + #include "map_files/templates/spacehotel/s_06.dmm" #elif !defined(MAP_OVERRIDE) #warn a map has already been included. diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index d0c052649d9..11b0a75b275 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -165,4 +165,4 @@ /obj/item/spellbook/oneuse/mime/greaterwall spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime spellname = "Invisible Greater Wall" - desc = "It contains illustrations of the great walls of human history." \ No newline at end of file + desc = "It contains illustrations of the great walls of human history."