cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add proper config for ruins, helm fix, selfloop Lavaland

Browse Source
This commit is contained in:
Mark van Alphen
2019-04-12 19:41:31 +02:00
parent 6fcd95fa50
commit 36b74eeaea
6 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/cyberiad.dm
+2 -2
View File
@@ -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)))
_maps/delta.dm
+2 -2
View File
@@ -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)))
_maps/metastation.dm
+1 -1
View File
@@ -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)))
_maps/test_all_maps.dm
+14
View File
@@ -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"
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -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
config/example/lavaRuinBlacklist.txt
+11 -2
View File
@@ -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