diff --git a/_maps/cyberiad.dm b/_maps/cyberiad.dm index dceb8f4bc47..44090ba3faa 100644 --- a/_maps/cyberiad.dm +++ b/_maps/cyberiad.dm @@ -23,11 +23,11 @@ z7 = empty #define MINETYPE "lavaland" #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL,STATION_CONTACT,REACHABLE,AI_OK)),\ +DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\ DECLARE_LEVEL(CONSTRUCTION, CROSSLINKED, list(REACHABLE)),\ -DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\ +DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\ DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\ DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE))) diff --git a/_maps/delta.dm b/_maps/delta.dm index 83a4d72c24d..c6db5e18750 100644 --- a/_maps/delta.dm +++ b/_maps/delta.dm @@ -28,11 +28,11 @@ Lovingly ported by Purpose2 to Paradise #define MAP_NAME "Kerberos" #define MINETYPE "lavaland" #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL,STATION_CONTACT,REACHABLE,AI_OK)),\ +DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\ DECLARE_LEVEL(CONSTRUCTION, CROSSLINKED, list(REACHABLE)),\ -DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\ +DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\ DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\ DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE))) diff --git a/_maps/metastation.dm b/_maps/metastation.dm index 6466bc1c0d9..0ab9595c49a 100644 --- a/_maps/metastation.dm +++ b/_maps/metastation.dm @@ -30,7 +30,7 @@ DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, RE DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\ DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\ -DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, AI_OK, ORE_LEVEL, HAS_WEATHER)),\ +DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, AI_OK, ORE_LEVEL, HAS_WEATHER)),\ DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)),\ DECLARE_LEVEL(EMPTY_AREA_2, CROSSLINKED, list(REACHABLE))) diff --git a/_maps/test_all_maps.dm b/_maps/test_all_maps.dm index 48d9574b966..bfac4586c27 100644 --- a/_maps/test_all_maps.dm +++ b/_maps/test_all_maps.dm @@ -17,6 +17,20 @@ #include "map_files\RandomZLevels\wildwest.dmm" + // Lavaland Ruins + #include "_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm" + #include "_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm" + + // Space Ruins #include "map_files\RandomRuins\SpaceRuins\abandonedzoo.dmm" #include "map_files\RandomRuins\SpaceRuins\asteroid1.dmm" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 488ad93ddfc..7bda10fcf99 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -500,7 +500,7 @@ desc = "The skull of a dragon." armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100) heat_protection = HEAD - max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF flags = BLOCKHAIR flags_cover = HEADCOVERSEYES diff --git a/config/example/lavaRuinBlacklist.txt b/config/example/lavaRuinBlacklist.txt index ef5e81fceb1..9afbcc7af7c 100644 --- a/config/example/lavaRuinBlacklist.txt +++ b/config/example/lavaRuinBlacklist.txt @@ -4,12 +4,21 @@ #SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START ##BIODOMES - +#_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm ##RESPAWN - +#_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm ##SIN ##MISC +#_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm