Skip to content

Commit

Permalink
Теперь то точно пофиксил, яж не дура
Browse files Browse the repository at this point in the history
  • Loading branch information
Zorking committed May 18, 2016
1 parent 38e687d commit 24400f4
Showing 7 changed files with 240 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ var/list/lizard_names_female = file2list("config/names/lizard_female.txt")
var/list/clown_names = file2list("config/names/clown.txt")
var/list/mime_names = file2list("config/names/mime.txt")
var/list/carp_names = file2list("config/names/carp.txt")
var/list/golem_names = file2list("code/textfiles/golem.txt")
//var/list/golem_names = file2list("config/golem.txt")


var/list/verbs = file2list("config/names/verbs.txt")
4 changes: 2 additions & 2 deletions code/datums/helper_datums/map_template.dm
Original file line number Diff line number Diff line change
@@ -90,8 +90,8 @@

/proc/preloadRuinTemplates()
// Still supporting bans by filename
var/list/banned = generateMapList("config/lavaRuinBlacklist.txt")
banned += generateMapList("config/spaceRuinBlacklist.txt")
var/list/banned = generateMapList("code/textfiles/lavaRuinConfig.dm")
banned += generateMapList("code/textfiles/spaceRuinConfig.dm")

for(var/item in subtypesof(/datum/map_template/ruin))
var/datum/map_template/ruin/ruin_type = item
2 changes: 1 addition & 1 deletion code/game/gamemodes/nuclear/nuclear.dm
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
/datum/game_mode/nuclear
name = "nuclear emergency"
config_tag = "nuclear"
required_players = 30 // 30 players - 5 players to be the nuke ops = 25 players remaining
required_players = 20 // 30 players - 5 players to be the nuke ops = 25 players remaining
required_enemies = 5
recommended_enemies = 5
antag_flag = ROLE_OPERATIVE
159 changes: 159 additions & 0 deletions code/textfiles/golem.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
var/list/golem_names = list(
"Ablation",
"Alabaster",
"Alunite",
"Andesite",
"Anyhdrite",
"Basalt",
"Basin",
"Bauxite",
"Bedrock",
"Bismuth",
"Bismuthinite",
"Bituminous Coal",
"Borax",
"Boulder",
"Brimstone",
"Brittle",
"Calcite",
"Cassiterite",
"Cenozoic",
"Chalk",
"Chasm",
"Cheridite",
"Chert",
"Chromite",
"Cinnabar",
"Claystone",
"Coast",
"Cobaltite",
"Column",
"Conglomerate",
"Core",
"Crevasse",
"Crust",
"Cryolite",
"Crystal",
"Dacite",
"Diorite",
"Dolomite",
"Dolostone",
"Dragonforce",
"Earthflow",
"Epoch",
"Eutrophication",
"Fault",
"Flint",
"Foliation",
"Foreshock",
"Fossil",
"Gabbro",
"Galena",
"Garnierite",
"Geode",
"Geoge",
"Gneiss",
"Granite",
"Graphite",
"Gravel",
"Groove",
"Grotto",
"Gypsum",
"Hematite",
"Hornblende",
"Humus",
"Igneous",
"Ilmenite",
"Iron",
"Island",
"Jasper",
"Jet",
"Kaolinite",
"Kettle",
"Kimberlite",
"Komatiite",
"Landslide",
"Levee",
"Lignite",
"Limestone",
"Limonite",
"Luster",
"Madidite",
"Magnetite",
"Magnitude",
"Malachite",
"Mantle",
"Marble",
"Marcasite",
"Melange",
"Meme",
"Mica",
"Microcline",
"Migmatite",
"Mineral",
"Mountain",
"Mudstone",
"Obsidian",
"Olivine",
"Ore",
"Orpiment",
"Orthoclase",
"Outwash",
"Oxbow Lake",
"Oynx",
"Pahoehoe",
"Pebble",
"Pegmatite",
"Periclase",
"Petrified Wood",
"Phyllite",
"Pitchblende",
"Plate",
"Pothole",
"Puddingstone",
"Pyrite",
"Pyrolusite",
"Quake",
"Quarry",
"Quartz",
"Quartzite",
"Realgar",
"Reservoir",
"Rhyolite",
"Rock",
"Rock Salt",
"Rockfall",
"Rutile",
"Saltpeter",
"Sand",
"Sandstone",
"Satinspar",
"Schist",
"Sediment",
"Seismic",
"Selenite",
"Serpentine",
"Shale",
"Shore",
"Siltstone",
"Slag",
"Slate",
"Sphalerite",
"Stack",
"Stalactite",
"Stalagmite",
"Stibnite",
"Stone",
"Stress",
"Subduction",
"Sylvite",
"Talc",
"Tetrahedrite",
"Tidal",
"Trench",
"Valley",
"Volcano",
"Xenolith",
"Yardang",
"Zone"
)
40 changes: 40 additions & 0 deletions code/textfiles/lavaRuinConfig.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//#List the potential random ruins here. This file is for small things that would appear in lavaland, such as hidden temples or labs.
//#Maps must be the full path to them
//#Ruins should be 30x30 at max. Anymore than that will break the game.
//#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START

var/list/RuinMaps = list(

//##BIODOMES
"_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm",

//##RESPAWN
"_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_prisoner_crash.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm",

//##SIN
"_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm",

//##MISC
"_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_gym.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm",
"_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm",

)
34 changes: 34 additions & 0 deletions code/textfiles/spaceRuinConfig.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//#List the potential random ruins here. This file is for small things that would appear in space, like an asteroid or broken escape pod.
//#Maps must be the full path to them
//#Ruins should be 40x40 at max. Anymore than that will break the game.
//#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START

var/list/SpaceRuins = list(

// ASTEROIDS
"_maps/RandomRuins/SpaceRuins/way_home.dmm",
"_maps/RandomRuins/SpaceRuins/asteroid1.dmm",
"_maps/RandomRuins/SpaceRuins/asteroid2.dmm",
"_maps/RandomRuins/SpaceRuins/asteroid3.dmm",
"_maps/RandomRuins/SpaceRuins/asteroid4.dmm",
"_maps/RandomRuins/SpaceRuins/asteroid5.dmm",


// GENERIC DERELICTS
"_maps/RandomRuins/SpaceRuins/derelict1.dmm",
"_maps/RandomRuins/SpaceRuins/derelict2.dmm",
"_maps/RandomRuins/SpaceRuins/derelict3.dmm",
"_maps/RandomRuins/SpaceRuins/derelict4.dmm",
"_maps/RandomRuins/SpaceRuins/derelict5.dmm",
"_maps/RandomRuins/SpaceRuins/emptyshell.dmm",
"_maps/RandomRuins/SpaceRuins/intactemptyship.dmm",

// OTHER DERELICTS
"_maps/RandomRuins/SpaceRuins/spacebar.dmm",
"_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm",
"_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm",
"_maps/RandomRuins/SpaceRuins/onehalf.dmm",
"_maps/RandomRuins/SpaceRuins/mechtransport.dmm",
"_maps/RandomRuins/SpaceRuins/deepstorage.dmm",
"_maps/RandomRuins/SpaceRuins/gasthelizards.dmm"
)
3 changes: 3 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
@@ -1775,6 +1775,9 @@
#include "code\orphaned procs\AStar.dm"
#include "code\orphaned procs\dbcore.dm"
#include "code\orphaned procs\priority_announce.dm"
#include "code\textfiles\golem.dm"
#include "code\textfiles\lavaRuinConfig.dm"
#include "code\textfiles\spaceRuinConfig.dm"
#include "interface\interface.dm"
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"

0 comments on commit 24400f4

Please sign in to comment.