Commented out metadata and some other non-sensical stuff.

baystation12.dme

@@ -393,9 +393,6 @@
 #include "code\game\area\ai_monitored.dm"
 #include "code\game\area\areas.dm"
 #include "code\game\asteroid\artifacts.dm"
-#include "code\game\asteroid\asteroid.dm"
-#include "code\game\asteroid\device.dm"
-#include "code\game\asteroid\turf.dm"
 #include "code\game\events\Event.dm"
 #include "code\game\events\EventsMain.dm"
 #include "code\game\events\EventProcs\black_hole.dm"

code/defines/global.dm

@@ -12,7 +12,7 @@ var/global
 
 	defer_powernet_rebuild = 0		// true if net rebuild will be called manually after an event
 
-	list/global_map = null
+	//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_|

code/game/asteroid/artifacts.dm

@@ -113,3 +113,119 @@ var/global/list/spawned_surprises = list()
 	new /obj/item/weapon/card/id/syndicate(src)
 	new /obj/item/clothing/shoes/syndigaloshes(src)
 	return
+
+
+// Copied over from asteroid.dm
+var/global/max_secret_rooms = 3
+
+proc/make_mining_asteroid_secret(var/size = 5)
+	var/valid = 0
+	var/turf/T = null
+	var/sanity = 0
+	var/list/room = null
+	var/list/turfs = null
+
+
+	turfs = get_area_turfs(/area/mine/unexplored)
+
+	if(!turfs.len)
+		return 0
+
+	while(!valid)
+		valid = 1
+		sanity++
+		if(sanity > 100)
+			return 0
+
+		T=pick(turfs)
+		if(!T)
+			return 0
+
+		var/list/surroundings = list()
+
+		surroundings += range(7, locate(T.x,T.y,T.z))
+		surroundings += range(7, locate(T.x+size,T.y,T.z))
+		surroundings += range(7, locate(T.x,T.y+size,T.z))
+		surroundings += range(7, locate(T.x+size,T.y+size,T.z))
+
+		if(locate(/area/mine/explored) in surroundings)			// +5s are for view range
+			valid = 0
+			continue
+
+		if(locate(/turf/space) in surroundings)
+			valid = 0
+			continue
+
+		if(locate(/area/asteroid/artifactroom) in surroundings)
+			valid = 0
+			continue
+
+		if(locate(/turf/simulated/floor/plating/airless/asteroid) in surroundings)
+			valid = 0
+			continue
+
+	if(!T)
+		return 0
+
+	room = spawn_room(T,size,size,,,1)
+
+	if(room)
+		T = pick(room["floors"])
+		if(T)
+			var/surprise = null
+			valid = 0
+			while(!valid)
+				surprise = pickweight(space_surprises)
+				if(surprise in spawned_surprises)
+					if(prob(20))
+						valid++
+					else
+						continue
+				else
+					valid++
+
+			spawned_surprises.Add(surprise)
+			new surprise(T)
+
+	return 1
+
+proc/spawn_room(var/atom/start_loc,var/x_size,var/y_size,var/wall,var/floor , var/clean = 0 , var/name)
+	var/list/room_turfs = list("walls"=list(),"floors"=list())
+
+	//world << "Room spawned at [start_loc.x],[start_loc.y],[start_loc.z]"
+	if(!wall)
+		wall = pick(/turf/simulated/wall/r_wall,/turf/simulated/wall,/obj/effect/alien/resin)
+	if(!floor)
+		floor = pick(/turf/simulated/floor,/turf/simulated/floor/engine)
+
+	for(var/x = 0,x<x_size,x++)
+		for(var/y = 0,y<y_size,y++)
+			var/turf/T
+			var/cur_loc = locate(start_loc.x+x,start_loc.y+y,start_loc.z)
+			if(clean)
+				for(var/O in cur_loc)
+					del(O)
+
+			var/area/asteroid/artifactroom/A = new
+			if(name)
+				A.name = name
+			else
+				A.name = "Artifact Room #[start_loc.x][start_loc.y][start_loc.z]"
+
+
+
+			if(x == 0 || x==x_size-1 || y==0 || y==y_size-1)
+				if(wall == /obj/effect/alien/resin)
+					T = new floor(cur_loc)
+					new /obj/effect/alien/resin(T)
+				else
+					T = new wall(cur_loc)
+					room_turfs["walls"] += T
+			else
+				T = new floor(cur_loc)
+				room_turfs["floors"] += T
+
+			A.contents += T
+
+
+	return room_turfs

code/game/atom_procs.dm

@@ -1070,7 +1070,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 			src.Topic(nhref, params2list(nhref), src, 1)
 	return
 
-
+/*
 /atom/proc/get_global_map_pos()
 	if(!islist(global_map) || isemptylist(global_map)) return
 	var/cur_x = null
@@ -1086,7 +1086,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 		return list("x"=cur_x,"y"=cur_y)
 	else
 		return 0
-
+*/ //Don't touch this either. DMTG
 /atom/proc/checkpass(passflag)
 	return pass_flags&passflag
 

code/game/master_controller.dm

@@ -128,7 +128,7 @@ datum/controller/game_controller
 
 		ticker.process()
 
-		sleep(world.timeofday+12-start_time)
+		sleep(world.timeofday+10-start_time) // This is fine for our tick lag. DMTG
 
 		spawn process()
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -310,12 +310,13 @@ ZIPPO
 		user << "\blue You refill the pipe with tobacco."
 		smoketime = maxsmoketime
 	return
-
+/*
 /obj/item/clothing/mask/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/match))
 		..()
 	else
 		user << "\red The [src] straight out REFUSES to be lit by such means."
+*/// Yeah no. DMTG
 
 
 /obj/item/clothing/mask/pipe/cobpipe

code/game/turf.dm

@@ -1421,7 +1421,7 @@ turf/simulated/floor/return_siding_icon_state()
 			spawn (0)
 				if ((A && A.loc))
 					A.loc.Entered(A)
-
+/*
 /turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj)
 	var/cur_x
 	var/cur_y
@@ -1530,7 +1530,7 @@ turf/simulated/floor/return_siding_icon_state()
 				if ((A && A.loc))
 					A.loc.Entered(A)
 	return
-
+*/ //Don't touch this either! DMTG
 /obj/effect/vaultspawner
 	var/maxX = 6
 	var/maxY = 6

code/modules/mob/mob.dm

@@ -420,7 +420,7 @@
 	set src in usr
 	if(usr != src)
 		usr << "No."
-	var/msg = input(usr,"Set the flavor text in your 'examine' verb. Don't metagame!","Flavor Text",html_decode(flavor_text)) as message|null
+	var/msg = input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null
 
 	if(msg != null)
 		msg = copytext(msg, 1, MAX_MESSAGE_LEN)

code/modules/recycling/disposal.dm

@@ -626,10 +626,10 @@
 				if(H.mutations & FAT)		// is a human and fat?
 					has_fat_guy = 1			// set flag on holder
 			*/
-			if(istype(AM, /obj/structure/bigDelivery) && !hasmob)
+			if(istype(AM, /obj/structure/bigDelivery))// && !hasmob) Already have a check for this.
 				var/obj/structure/bigDelivery/T = AM
 				src.destinationTag = T.sortTag
-			if(istype(AM, /obj/item/smallDelivery) && !hasmob)
+			if(istype(AM, /obj/item/smallDelivery))// && !hasmob) And that. DMTG
 				var/obj/item/smallDelivery/T = AM
 				src.destinationTag = T.sortTag
 			else if (!src.destinationTag)

config/config.txt

@@ -82,7 +82,7 @@ TRAITOR_SCALING
 #TENSIONER_ACTIVE
 
 ## If metadata is supported
-ALLOW_METADATA
+# ALLOW_METADATA
 
 ## allow players to initiate a restart vote
 ALLOW_VOTE_RESTART

html/changelog.html

@@ -59,7 +59,6 @@ should be listed in the changelog upon commit though. Thanks. -->
 		<li class="rscadd">Adds a borg upgrade system. Can be used to reset modules or 'restart' dead cyborgs. </li>
 		<li class="rscadd">Officers can now use huds to modify humans' criminal statuses on the go. To do this, simply examine a human and at the end should be a clickable link to change the status. </li>
 		<li class="rscadd">Cell charger and Recharger are now wrenchable to make them moveable </li>
-		<li class="rscadd">You can add some metadata to your character which is purley OOC knowledge. Use it for RP preferences, backstories, whatever! Remember that flavour text is part of the IC examine! </li>
 		<li class="tweak">Cats and Dogs can see in the dark.  </li>
 		<li class="tweak">Changed around a few access levels; only jobs who need to do maintenance have access to maintenance tunnels. Also the heads and detective. </li>
 		<li class="tweak">Shuttle call/recall announcements are now more noticeable. </li>