Revert "Random not much finished bullshit work on mapdata."

This reverts commit d3179bb5b5.

baystation12.dme

@@ -105,6 +105,7 @@
 #define FILE_DIR "code/modules/flufftext"
 #define FILE_DIR "code/modules/food"
 #define FILE_DIR "code/modules/icon generation"
+#define FILE_DIR "code/modules/maps"
 #define FILE_DIR "code/modules/mining"
 #define FILE_DIR "code/modules/mob"
 #define FILE_DIR "code/modules/mob/dead"
@@ -172,6 +173,7 @@
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter/backup"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
@@ -209,9 +211,7 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/map_controller"
+#define FILE_DIR "maps/RandomZLevels"
-#define FILE_DIR "maps/map_editing"
-#define FILE_DIR "maps/map_storage"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"
@@ -907,6 +907,11 @@
 #include "code\modules\food\food.dm"
 #include "code\modules\food\meat.dm"
 #include "code\modules\food\recipes_microwave.dm"
+#include "code\modules\maps\dmm_suite.dm"
+#include "code\modules\maps\randomZlevel.dm"
+#include "code\modules\maps\reader.dm"
+#include "code\modules\maps\SwapMaps.dm"
+#include "code\modules\maps\writer.dm"
 #include "code\modules\mining\machine_input_output_plates.dm"
 #include "code\modules\mining\machine_processing.dm"
 #include "code\modules\mining\machine_stacking.dm"
@@ -1277,11 +1282,4 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\tgstation.2.0.8.dmm"
-#include "maps\map_controller\map_controller.dm"
-#include "maps\map_controller\maps.dm"
-#include "maps\map_editing\dmm_suite.dm"
-#include "maps\map_editing\randomZlevel.dm"
-#include "maps\map_editing\reader.dm"
-#include "maps\map_editing\SwapMaps.dm"
-#include "maps\map_editing\writer.dm"
 // END_INCLUDE

code/WorkInProgress/SkyMarshal/DebuggingNTesting.dm

@@ -1,11 +0,0 @@
-mob/verb/add_z()
-	set usr = src
-	set category = "TEST"
-
-	world.maxz++
-
-mob/verb/remove_z()
-	set usr = src
-	set category = "TEST"
-
-	world.maxz--

code/WorkInProgress/new_explosion.dm

@@ -1,152 +0,0 @@
-/* - uncomment this to test it out! */
-/mob/verb/kaboom()
-	var/power = input(src, "power?", "power?") as num
-	var/turf/T = get_turf(src)
-	explosion_rec(T, power)
-
-/obj
-	var/explosion_resistance
-
-/datum/explosion_turf
-	var/turf/turf //The turf which will get ex_act called on it
-	var/max_power //The largest amount of power the turf sustained
-
-	New()
-		..()
-		max_power = 0
-
-	proc/save_power_if_larger(power)
-		if(power > max_power)
-			max_power = power
-			return 1
-		return 0
-
-var/list/datum/explosion_turf/explosion_turfs = list()
-var/explosion_in_progress = 0
-
-proc/get_explosion_turf(var/turf/T)
-	for( var/datum/explosion_turf/ET in explosion_turfs )
-		if( T == ET.turf )
-			return ET
-	var/datum/explosion_turf/ET = new()
-	ET.turf = T
-	explosion_turfs += ET
-	return ET
-
-proc/explosion_rec(turf/epicenter, power)
-
-	var/loopbreak = 0
-	while(explosion_in_progress)
-		if(loopbreak >= 15) return
-		sleep(10)
-		loopbreak++
-
-	if(power <= 0) return
-	epicenter = get_turf(epicenter)
-	if(!epicenter) return
-
-	message_admins("Explosion with size ([power]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z])")
-	log_game("Explosion with size ([power]) in area [epicenter.loc.name] ")
-
-	playsound(epicenter, 'explosionfar.ogg', 100, 1, round(power*2,1) )
-	playsound(epicenter, "explosion", 100, 1, round(power,1) )
-
-	explosion_in_progress = 1
-	explosion_turfs = list()
-	var/datum/explosion_turf/ETE = get_explosion_turf()
-	ETE.turf = epicenter
-	ETE.max_power = power
-
-	//This steap handles the gathering of turfs which will be ex_act() -ed in the next step. It also ensures each turf gets the maximum possible amount of power dealt to it.
-	for(var/direction in cardinal)
-		var/turf/T = get_step(epicenter, direction)
-		T.explosion_spread(power - epicenter.explosion_resistance, direction)
-
-	//This step applies the ex_act effects for the explosion, as planned in the previous step.
-	for( var/datum/explosion_turf/ET in explosion_turfs )
-		if(ET.max_power <= 0) continue
-		if(!ET.turf) continue
-
-		var/severity = 4 - round(max(min( 3, (ET.max_power / 3) ) ,1), 1)
-		var/x = ET.turf.x
-		var/y = ET.turf.y
-		var/z = ET.turf.z
-		ET.turf.ex_act(severity)
-		if(!ET.turf)
-			ET.turf = locate(x,y,z)
-		for( var/atom/A in ET.turf )
-			A.ex_act(severity)
-
-	explosion_in_progress = 0
-
-/turf
-	var/explosion_resistance
-
-/turf/space
-	explosion_resistance = 10
-
-/turf/simulated/floor
-	explosion_resistance = 1
-
-/turf/simulated/mineral
-	explosion_resistance = 2
-
-/turf/simulated/shuttle/floor
-	explosion_resistance = 1
-
-/turf/simulated/shuttle/floor4
-	explosion_resistance = 1
-
-/turf/simulated/shuttle/plating
-	explosion_resistance = 1
-
-/turf/simulated/shuttle/wall
-	explosion_resistance = 5
-
-/turf/simulated/wall
-	explosion_resistance = 5
-
-/turf/simulated/r_wall
-	explosion_resistance = 25
-
-/turf/simulated/wall/r_wall
-	explosion_resistance = 25
-
-//Code-wise, a safe value for power is something up to ~25 or ~30.. This does quite a bit of damage to the station.
-//direction is the direction that the spread took to come to this tile. So it is pointing in the main blast direction - meaning where this tile should spread most of it's force.
-/turf/proc/explosion_spread(power, direction)
-	if(power <= 0)
-		return
-
-	/*
-	sleep(2)
-	new/obj/effect/debugging/marker(src)
-	*/
-
-	var/datum/explosion_turf/ET = get_explosion_turf(src)
-	if(ET.max_power >= power)
-		return //The turf already sustained and spread a power greated than what we are dealing with. No point spreading again.
-	ET.max_power = power
-
-	var/spread_power = power - src.explosion_resistance //This is the amount of power that will be spread to the tile in the direction of the blast
-	var/side_spread_power = power - 2 * src.explosion_resistance //This is the amount of power that will be spread to the side tiles
-	for(var/obj/O in src)
-		if(O.explosion_resistance)
-			spread_power -= O.explosion_resistance
-			side_spread_power -= O.explosion_resistance
-
-	var/turf/T = get_step(src, direction)
-	T.explosion_spread(spread_power, direction)
-	T = get_step(src, turn(direction,90))
-	T.explosion_spread(side_spread_power, turn(direction,90))
-	T = get_step(src, turn(direction,-90))
-	T.explosion_spread(side_spread_power, turn(direction,90))
-
-	/*
-	for(var/direction in cardinal)
-		var/turf/T = get_step(src, direction)
-		T.explosion_spread(spread_power)
-	*/
-
-/turf/unsimulated/explosion_spread(power)
-	return //So it doesn't get to the parent proc, which simulates explosions

code/datums/configuration.dm

@@ -32,6 +32,7 @@
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
 	var/Tensioner_Active = 0			// If the tensioner is running.
+	var/allow_Metadata = 0				// Metadata is supported.
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
 	var/Tickcomp = 0
@@ -49,7 +50,6 @@
 	var/kick_inactive = 0				//force disconnect for inactive players
 	var/load_jobs_from_txt = 0
 	var/usealienwhitelist = 0
-	var/allow_Metadata = 0
 
 	var/server
 	var/banappeals
@@ -185,7 +185,7 @@
 				if ("allow_admin_jump")
 					config.allow_admin_jump = 1
 
-				if ("allow_admin_rev")
+				if("allow_admin_rev")
 					config.allow_admin_rev = 1
 
 				if ("allow_admin_spawning")

code/defines/global.dm

@@ -1,18 +1,31 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
-var/obj/effect/datacore/data_core = null
+var/global/obj/effect/datacore/data_core = null
-var/obj/effect/overlay/plmaster = null
+var/global/obj/effect/overlay/plmaster = null
-var/obj/effect/overlay/slmaster = null
+var/global/obj/effect/overlay/slmaster = null
 
 	//obj/hud/main_hud1 = null
 
-var/list/machines = list()
+var/global/list/machines = list()
-var/list/processing_objects = list()
+var/global/list/processing_objects = list()
-var/list/active_diseases = list()
+var/global/list/active_diseases = list()
 		//items that ask to be called every cycle
 
-var/defer_powernet_rebuild = 0		// true if net rebuild will be called manually after an event
+var/global/defer_powernet_rebuild = 0		// true if net rebuild will be called manually after an event
 
+	//list/global_map = null //Borked, do not touch. DMTG
+	//list/global_map = list(list(1,5),list(4,3))//an array of map Z levels.
+	//Resulting sector map looks like
+	//|_1_|_4_|
+	//|_5_|_3_|
+	//
+	//1 - SS13
+	//4 - Derelict
+	//3 - AI satellite
+	//5 - empty space
+
+
+	//////////////
 
 var/BLINDBLOCK = 0
 var/DEAFBLOCK = 0
@@ -91,6 +104,10 @@ var/list/reg_dna = list(  )
 var/CELLRATE = 0.002  // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
 var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
 
+var/shuttle_z = 2	//default
+var/airtunnel_start = 68 // default
+var/airtunnel_stop = 68 // default
+var/airtunnel_bottom = 72 // default
 var/list/monkeystart = list()
 var/list/wizardstart = list()
 var/list/newplayer_start = list()

code/game/jobs/job/job.dm

@@ -10,6 +10,12 @@
 	//Players will be allowed to spawn in as jobs that are set to "Station"
 	var/faction = "None"
 
+	//How many players can be this job
+	var/total_positions = 0
+
+	//How many players can spawn in as this job
+	var/spawn_positions = 0
+
 	//How many players have this job
 	var/current_positions = 0
 

code/game/json.dm

@@ -40,7 +40,7 @@ proc/makejson()
 			players += "[C.key];"
 	F << "{\"mode\":\"[mode]\",\"players\" : \"[players]\",\"playercount\" : \"[playerscount]\",\"admin\" : \"[admins]\",\"time\" : \"[time2text(world.realtime,"MM/DD - hh:mm")]\"}"
 	fcopy("info.json","[jsonpath]/info.json")
-/*
+
 /proc/switchmap(newmap,newpath)
 	var/oldmap
 	var/obj/mapinfo/M = locate()
@@ -95,7 +95,6 @@ client/proc/ChangeMap(var/X as text)
 	set name = "Change Map"
 	set category  = "Admin"
 	switchmap(X,X)
-	*/
 proc/send2irc(msg,msg2)
  	shell("python nudge.py [msg] [msg2]")
 proc/send2adminirc(channel,msg)

code/game/landmarks.dm

@@ -4,6 +4,19 @@
 	tag = text("landmark*[]", name)
 	invisibility = 101
 
+	if (name == "shuttle")
+		shuttle_z = z
+		del(src)
+
+	if (name == "airtunnel_stop")
+		airtunnel_stop = x
+
+	if (name == "airtunnel_start")
+		airtunnel_start = x
+
+	if (name == "airtunnel_bottom")
+		airtunnel_bottom = y
+
 	if (name == "monkey")
 		monkeystart += loc
 		del(src)
@@ -23,7 +36,8 @@
 	if (name == "prisonwarp")
 		prisonwarp += loc
 		del(src)
-
+//	if (name == "mazewarp")
+//		mazewarp += loc
 	if (name == "Holding Facility")
 		holdingfacility += loc
 	if (name == "tdome1")

code/setup_3d.dm

@@ -9,7 +9,7 @@
 
 var/list/levels_3d = list(1,2) //To expediate calculations, just do "z in levels_3d"
 
-var/list/global_adjacent_z_levels = list(list("up" = 2),list("down" = 1),null,null,null,null) //Example.  2 is above 1
+var/list/global_adjacent_z_levels = list("1" = list("up" = 2), "2" = list("down" = 1)) //Example.  2 is above 1
 
 //Commented out ones are incomplete.
 //#include "TriDimension\Pipes.dm" //Example

maps/map_controller/maps.dm

@@ -1,47 +0,0 @@
-  /////////////////////////////////////////////////////////////////////////////
- //Contents: Map datums for use with runtime map loading, and voteable maps.//
-/////////////////////////////////////////////////////////////////////////////
-
-map
-	var
-		name = "Default/Debug Map"
-		desc = "You should not see this, tell a coder."
-		is_playable = 1
-		is_flotilla = 0
-		relative_path = "maps/tgstation.2.0.8.dmm" //Path from the .dmb file to the map.  Set to TG station in case of derp.
-
-		x = 1
-		y = 1
-		z = 1
-
-		engsec_job_flags = 0
-		list/engsec_spawn_positions = list()
-		list/engsec_total_positions = list()
-
-		medsci_job_flags = 0
-		list/medsci_spawn_positions = list()
-		list/medsci_total_positions = list()
-
-		civilian_job_flags = 0
-		list/civilian_spawn_positions = list()
-		list/civilian_total_positions = list()
-
-
-
-map/tg_station
-	name = "/TG/'s SS13 map, TGstation 2.0.8"
-	desc = "A large map featuring a space station, derelict, mining asteroid, and communication satelite."
-	relative_path = "maps/tgstation.2.0.8.dmm"
-	x = 255
-	y = 255
-	z = 6
-
-//All possible jobs availible.
-	engsec_job_flags = CAPTAIN|HOS|WARDEN|DETECTIVE|OFFICER|CHIEF|ENGINEER|ATMOSTECH|ROBOTICIST|AI|CYBORG
-	engsec_spawn_positions = list("[CAPTAIN]" = 1,
-
-
-	medsci_job_flags = RD|SCIENTIST|CHEMIST|CMO|DOCTOR|GENETICIST
-
-
-	civilian_job_flags = HOP|BARTENDER|BOTANIST|CHEF|JANITOR|LIBRARIAN|QUARTERMASTER|CARGOTECH|MINER|LAWYER|CHAPLAIN|CLOWN|MIME|ASSISTANT