Merge pull request #1 from ParadiseSS13/master

Downstream merge

code/modules/admin/verbs/one_click_antag.dm

@@ -496,21 +496,38 @@ client/proc/one_click_antag()
 
 	var/mob/living/carbon/human/new_vox = new(spawn_location.loc, "Vox")
 
-	new_vox.gender = pick(MALE, FEMALE)
-	new_vox.h_style = "Short Vox Quills"
-	new_vox.regenerate_icons()
+	var/sounds = rand(2,8)
+	var/i = 0
+	var/newname = ""
 
+	while(i<=sounds)
+		i++
+		newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))	
+	
+	new_vox.real_name = capitalize(newname)
+	new_vox.name = new_vox.real_name
 	new_vox.age = rand(12,20)
-
-	new_vox.dna.ready_dna(new_vox) // Creates DNA.
 	new_vox.dna.mutantrace = "vox"
-	new_vox.set_species("Vox") // Actually makes the vox! How about that.
-	new_vox.generate_name()
+	new_vox.set_species("Vox")
+	new_vox.languages = list() // Removing language from chargen.
+	new_vox.flavor_text = ""
 	new_vox.add_language("Vox-pidgin")
-	new_vox.mind_initialize()
-	new_vox.mind.assigned_role = "MODE"
-	new_vox.mind.special_role = "Vox Raider"
-	new_vox.mutations |= M_NOCLONE //Stops the station crew from messing around with their DNA.
+	new_vox.add_language("Galactic Common")
+	new_vox.add_language("Tradeband")
+	new_vox.h_style = "Short Vox Quills"
+	new_vox.f_style = "Shaved"
+
+	for(var/datum/organ/external/limb in new_vox.organs)
+		limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
+
+	//Now apply cortical stack.
+	var/datum/organ/external/E = new_vox.get_organ("head")	
+	var/obj/item/weapon/implant/cortical/I = new(new_vox)
+	I.imp_in = new_vox
+	I.implanted = 1
+	I.part = E
+	E.implants += I
+	cortical_stacks += I
 
 	ticker.mode.traitors += new_vox.mind
 	new_vox.equip_vox_raider()

code/modules/admin/verbs/vox_raiders.dm

@@ -55,7 +55,7 @@ var/global/vox_tick = 1
 	var/obj/item/weapon/card/id/syndicate/W = new(src)
 	W.name = "[real_name]'s Legitimate Human ID Card"
 	W.icon_state = "id"
-	W.access = list(access_syndicate)
+	W.access = list(access_vox)
 	W.assignment = "Trader"
 	W.registered_name = real_name
 	W.registered_user = src

code/modules/awaymissions/gateway.dm

@@ -5,6 +5,7 @@
 	icon_state = "off"
 	density = 1
 	anchored = 1
+	unacidable = 1
 	var/active = 0
 
 
@@ -37,7 +38,7 @@
 /obj/machinery/gateway/centerstation/initialize()
 	update_icon()
 	wait = world.time + config.gateway_delay	//+ thirty minutes default
-	awaygate = locate(/obj/machinery/gateway/centeraway)
+	awaygate = locate(/obj/machinery/gateway/centeraway) in world
 
 
 /obj/machinery/gateway/centerstation/update_icon()
@@ -82,8 +83,10 @@ obj/machinery/gateway/centerstation/process()
 	if(linked.len != 8)	return
 	if(!powered())		return
 	if(!awaygate)
-		user << "<span class='notice'>Error: No destination found.</span>"
-		return
+		awaygate = locate(/obj/machinery/gateway/centeraway) in world
+		if(!awaygate)
+			user << "<span class='notice'>Error: No destination found.</span>"
+			return
 	if(world.time < wait)
 		user << "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>"
 		return
@@ -118,15 +121,12 @@ obj/machinery/gateway/centerstation/process()
 	if(!ready)		return
 	if(!active)		return
 	if(!awaygate)	return
+
 	if(awaygate.calibrated)
 		M.loc = get_step(awaygate.loc, SOUTH)
 		M.dir = SOUTH
 		return
 	else
-		for(var/obj/effect/landmark/L in landmarks_list)
-			if (L.name != "awaystart")
-				continue
-			awaydestinations.Add(L)
 		var/obj/effect/landmark/dest = pick(awaydestinations)
 		if(dest)
 			M.loc = dest.loc
@@ -134,6 +134,7 @@ obj/machinery/gateway/centerstation/process()
 			use_power(5000)
 		return
 
+
 /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/device/multitool))
 		user << "\black The gate is already calibrated, there is no work for you to do here."
@@ -154,7 +155,7 @@ obj/machinery/gateway/centerstation/process()
 
 /obj/machinery/gateway/centeraway/initialize()
 	update_icon()
-	stationgate = locate(/obj/machinery/gateway/centerstation)
+	stationgate = locate(/obj/machinery/gateway/centerstation) in world
 
 
 /obj/machinery/gateway/centeraway/update_icon()
@@ -188,8 +189,10 @@ obj/machinery/gateway/centerstation/process()
 	if(!ready)			return
 	if(linked.len != 8)	return
 	if(!stationgate)
-		user << "<span class='notice'>Error: No destination found.</span>"
-		return
+		stationgate = locate(/obj/machinery/gateway/centerstation) in world
+		if(!stationgate)
+			user << "<span class='notice'>Error: No destination found.</span>"
+			return
 
 	for(var/obj/machinery/gateway/G in linked)
 		G.active = 1
@@ -234,6 +237,6 @@ obj/machinery/gateway/centerstation/process()
 			user << "\black The gate is already calibrated, there is no work for you to do here."
 			return
 		else
-			user << "\blue <b>Recalibration successful!</b>: \black This gate's systems have been fine tuned.  Travel to this gate will now be on target."
+			user << "<span class='boldnotice'>Recalibration successful!</span>: \black This gate's systems have been fine tuned.  Travel to this gate will now be on target."
 			calibrated = 1
 			return

code/modules/awaymissions/maploader/dmm_suite.dm

@@ -53,11 +53,10 @@ dmm_suite{
 
 		*/
 
-	verb/load_map(var/dmm_file as file, var/z_offset as num, var/load_speed as num)
+	verb/load_map(var/dmm_file as file, var/z_offset as num){
 		// dmm_file: A .dmm file to load (Required).
 		// z_offset: A number representing the z-level on which to start loading the map (Optional).
-		// load_speed: How many tiles should be loaded per second, defaults to no pause (Optional)
-
+		}
 	verb/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){
 		// t1: A turf representing one corner of a three dimensional grid (Required).
 		// t2: Another turf representing the other corner of the same grid (Required).

code/modules/awaymissions/maploader/reader.dm

@@ -0,0 +1,332 @@
+///////////////////////////////////////////////////////////////
+//SS13 Optimized Map loader
+//////////////////////////////////////////////////////////////
+
+//global datum that will preload variables on atoms instanciation
+var/global/dmm_suite/preloader/_preloader = null
+
+
+/**
+ * Construct the model map and control the loading process
+ *
+ * WORKING :
+ *
+ * 1) Makes an associative mapping of model_keys with model
+ *		e.g aa = /turf/unsimulated/wall{icon_state = "rock"}
+ * 2) Read the map line by line, parsing the result (using parse_grid)
+ *
+ */
+/dmm_suite/load_map(var/dmm_file as file, var/z_offset as num)
+	if(!z_offset)//what z_level we are creating the map on
+		z_offset = world.maxz+1
+
+	var/quote = ascii2text(34)
+	var/tfile = file2text(dmm_file)//the map file we're creating
+	var/tfile_len = length(tfile)
+	var/lpos = 1 // the models definition index
+
+	///////////////////////////////////////////////////////////////////////////////////////
+	//first let's map model keys (e.g "aa") to their contents (e.g /turf/space{variables})
+	///////////////////////////////////////////////////////////////////////////////////////
+	var/list/grid_models = list()
+	var/key_len = length(copytext(tfile,2,findtext(tfile,quote,2,0)))//the length of the model key (e.g "aa" or "aba")
+
+	//proceed line by line
+	for(lpos=1; lpos<tfile_len; lpos=findtext(tfile,"\n",lpos,0)+1)
+		var/tline = copytext(tfile,lpos,findtext(tfile,"\n",lpos,0))
+		if(copytext(tline,1,2) != quote)//we reached the map "layout"
+			break
+		var/model_key = copytext(tline,2,2+key_len)
+		var/model_contents = copytext(tline,findtext(tfile,"=")+3,length(tline))
+		grid_models[model_key] = model_contents
+		sleep(-1)
+
+	///////////////////////////////////////////////////////////////////////////////////////
+	//now let's fill the map with turf and objects using the constructed model map
+	///////////////////////////////////////////////////////////////////////////////////////
+
+	//position of the currently processed square
+	var/zcrd=-1
+	var/ycrd=0
+	var/xcrd=0
+
+	for(var/zpos=findtext(tfile,"\n(1,1,",lpos,0);zpos!=0;zpos=findtext(tfile,"\n(1,1,",zpos+1,0))	//in case there's several maps to load
+
+		zcrd++
+		world.maxz = max(world.maxz, zcrd+z_offset)//create a new z_level if needed
+
+		var/zgrid = copytext(tfile,findtext(tfile,quote+"\n",zpos,0)+2,findtext(tfile,"\n"+quote,zpos,0)+1) //copy the whole map grid
+		var/z_depth = length(zgrid)
+
+		//if exceeding the world max x or y, increase it
+		var/x_depth = length(copytext(zgrid,1,findtext(zgrid,"\n",2,0)))
+		if(world.maxx<x_depth)
+			world.maxx=x_depth
+
+		var/y_depth = z_depth / (x_depth+1)//x_depth + 1 because we're counting the '\n' characters in z_depth
+		if(world.maxy<y_depth)
+			world.maxy=y_depth
+
+		//then proceed it line by line, starting from top
+		ycrd = y_depth
+
+		for(var/gpos=1;gpos!=0;gpos=findtext(zgrid,"\n",gpos,0)+1)
+			var/grid_line = copytext(zgrid,gpos,findtext(zgrid,"\n",gpos,0))
+
+			//fill the current square using the model map
+			xcrd=0
+			for(var/mpos=1;mpos<=x_depth;mpos+=key_len)
+				xcrd++
+				var/model_key = copytext(grid_line,mpos,mpos+key_len)
+				parse_grid(grid_models[model_key],xcrd,ycrd,zcrd+z_offset)
+
+			//reached end of current map
+			if(gpos+x_depth+1>z_depth)
+				break
+
+			ycrd--
+
+			sleep(-1)
+
+		//reached End Of File
+		if(findtext(tfile,quote+"}",zpos,0)+2==tfile_len)
+			break
+		sleep(-1)
+
+/**
+ * Fill a given tile with its area/turf/objects/mobs
+ * Variable model is one full map line (e.g /turf/unsimulated/wall{icon_state = "rock"},/area/mine/explored)
+ *
+ * WORKING :
+ *
+ * 1) Read the model string, member by member (delimiter is ',')
+ *
+ * 2) Get the path of the atom and store it into a list
+ *
+ * 3) a) Check if the member has variables (text within '{' and '}')
+ *
+ * 3) b) Construct an associative list with found variables, if any (the atom index in members is the same as its variables in members_attributes)
+ *
+ * 4) Instanciates the atom with its variables
+ *
+ */
+/dmm_suite/proc/parse_grid(var/model as text,var/xcrd as num,var/ycrd as num,var/zcrd as num)
+	/*Method parse_grid()
+	- Accepts a text string containing a comma separated list of type paths of the
+		same construction as those contained in a .dmm file, and instantiates them.
+	*/
+
+	var/list/members = list()//will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored)
+	var/list/members_attributes = list()//will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())
+
+
+	/////////////////////////////////////////////////////////
+	//Constructing members and corresponding variables lists
+	////////////////////////////////////////////////////////
+
+	var/index=1
+	var/old_position = 1
+	var/dpos
+
+	do
+		//finding next member (e.g /turf/unsimulated/wall{icon_state = "rock"} or /area/mine/explored)
+		dpos= find_next_delimiter_position(model,old_position,",","{","}")//find next delimiter (comma here) that's not within {...}
+
+		var/full_def = copytext(model,old_position,dpos)//full definition, e.g : /obj/foo/bar{variables=derp}
+		var/atom_def = text2path(copytext(full_def,1,findtext(full_def,"{")))//path definition, e.g /obj/foo/bar
+		members.Add(atom_def)
+		old_position = dpos + 1
+
+		//transform the variables in text format into a list (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
+		var/list/fields = list()
+
+		var/variables_start = findtext(full_def,"{")
+		if(variables_start)//if there's any variable
+			full_def = copytext(full_def,variables_start+1,length(full_def))//removing the last '}'
+			fields = text2list(full_def,";")
+
+		//then fill the members_attributes list with the corresponding variables
+		members_attributes.len++
+		members_attributes[index++] = fields
+
+		sleep(-1)
+	while(dpos != 0)
+
+
+	////////////////
+	//Instanciation
+	////////////////
+
+	//The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile
+
+	//in case of multiples turfs on one tile,
+	//will contains the images of all underlying turfs, to simulate the DMM multiple tiles piling
+	var/list/turfs_underlays = list()
+
+	//first instance the /area and remove it from the members list
+	index = members.len
+	var/atom/instance
+	_preloader = new(members_attributes[index])//preloader for assigning  set variables on atom creation
+
+	instance = locate(members[index])
+	instance.contents.Add(locate(xcrd,ycrd,zcrd))
+
+	if(_preloader && instance)
+		_preloader.load(instance)
+
+	members.Remove(members[index])
+
+	//then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect
+
+	var/first_turf_index = 1
+	while(!ispath(members[first_turf_index],/turf)) //find first /turf object in members
+		first_turf_index++
+
+	//instanciate the first /turf
+	var/turf/T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],xcrd,ycrd,zcrd)
+
+	//if others /turf are presents, simulates the underlays piling effect
+	index = first_turf_index + 1
+	while(index <= members.len)
+		turfs_underlays.Insert(1,image(T.icon,null,T.icon_state,T.layer,T.dir))//add the current turf image to the underlays list
+		var/turf/UT = instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)//instance new turf
+		add_underlying_turf(UT,T,turfs_underlays)//simulates the DMM piling effect
+		T = UT
+		index++
+
+	//finally instance all remainings objects/mobs
+	for(index=1,index < first_turf_index,index++)
+		instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)
+
+////////////////
+//Helpers procs
+////////////////
+
+//Instance an atom at (x,y,z) and gives it the variables in attributes
+/dmm_suite/proc/instance_atom(var/path,var/list/attributes, var/x, var/y, var/z)
+	var/atom/instance
+	_preloader = new(attributes, path)
+
+	instance = new path (locate(x,y,z))//first preloader pass
+
+	if(_preloader && instance)//second preloader pass, for those atoms that don't ..() in New()
+		_preloader.load(instance)
+
+	return instance
+
+//text trimming (both directions) helper proc
+//optionally removes quotes before and after the text (for variable name)
+/dmm_suite/proc/trim_text(var/what as text,var/trim_quotes=0)
+	while(length(what) && (findtext(what," ",1,2)))
+		what=copytext(what,2,0)
+	while(length(what) && (findtext(what," ",length(what),0)))
+		what=copytext(what,1,length(what))
+	if(trim_quotes)
+		while(length(what) && (findtext(what,quote,1,2)))
+			what=copytext(what,2,0)
+		while(length(what) && (findtext(what,quote,length(what),0)))
+			what=copytext(what,1,length(what))
+	return what
+
+//find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape
+//returns 0 if reached the last delimiter
+/dmm_suite/proc/find_next_delimiter_position(var/text as text,var/initial_position as num, var/delimiter=",",var/opening_escape=quote,var/closing_escape=quote)
+	var/position = initial_position
+	var/next_delimiter = findtext(text,delimiter,position,0)
+	var/next_opening = findtext(text,opening_escape,position,0)
+
+	while((next_opening != 0) && (next_opening < next_delimiter))
+		position = findtext(text,closing_escape,next_opening + 1,0)+1
+		next_delimiter = findtext(text,delimiter,position,0)
+		next_opening = findtext(text,opening_escape,position,0)
+
+	return next_delimiter
+
+
+//build a list from variables in text form (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
+//return the filled list
+/dmm_suite/proc/text2list(var/text as text,var/delimiter=",")
+
+	var/list/to_return = list()
+
+	var/position
+	var/old_position = 1
+
+	do
+		//find next delimiter that is not within  "..."
+		position = find_next_delimiter_position(text,old_position,delimiter)
+
+		//check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7))
+		var/equal_position = findtext(text,"=",old_position, position)
+
+		var/trim_left = trim_text(copytext(text,old_position,(equal_position ? equal_position : position)),1)//the name of the variable, must trim quotes to build a BYOND compliant associatives list
+		old_position = position + 1
+
+		if(equal_position)//associative var, so do the association
+			var/trim_right = trim_text(copytext(text,equal_position+1,position))//the content of the variable
+
+			//Check for string
+			if(findtext(trim_right,quote,1,2))
+				trim_right = copytext(trim_right,2,findtext(trim_right,quote,3,0))
+
+			//Check for number
+			else if(isnum(text2num(trim_right)))
+				trim_right = text2num(trim_right)
+
+			//Check for null
+			else if(trim_right == "null")
+				trim_right = null
+
+			//Check for list
+			else if(copytext(trim_right,1,5) == "list")
+				trim_right = text2list(copytext(trim_right,6,length(trim_right)))
+
+			//Check for file
+			else if(copytext(trim_right,1,2) == "'")
+				trim_right = file(copytext(trim_right,2,length(trim_right)))
+
+			to_return[trim_left] = trim_right
+
+		else//simple var
+			to_return[trim_left] = null
+
+	while(position != 0)
+
+	return to_return
+
+//simulates the DM multiple turfs on one tile underlaying
+/dmm_suite/proc/add_underlying_turf(var/turf/placed,var/turf/underturf, var/list/turfs_underlays)
+	if(underturf.density)
+		placed.density = 1
+	if(underturf.opacity)
+		placed.opacity = 1
+	placed.underlays += turfs_underlays
+
+//atom creation method that preloads variables at creation
+/atom/New()
+	if(_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
+		_preloader.load(src)
+
+	. = ..()
+
+//////////////////
+//Preloader datum
+//////////////////
+
+/dmm_suite/preloader
+	parent_type = /datum
+	var/list/attributes
+	var/target_path
+
+/dmm_suite/preloader/New(var/list/the_attributes, var/path)
+	.=..()
+	if(!the_attributes.len)
+		Del()
+		return
+	attributes = the_attributes
+	target_path = path
+
+/dmm_suite/preloader/proc/load(atom/what)
+	for(var/attribute in attributes)
+		what.vars[attribute] = attributes[attribute]
+	Del()

code/modules/awaymissions/maploader/swapmaps.dm

@@ -89,7 +89,7 @@
 	swapmap.New()
 		Create a new map datum, but does not allocate space or assign an
 		 ID (used for loading).
-	swapmap.Destroy()
+	swapmap.Del()
 		Deletes a map but does not save
 	swapmap.Save()
 		Saves to map_[id].sav
@@ -174,9 +174,9 @@ swapmap
 			   x2>swapmaps_compiled_maxx)
 				var/list/areas=new
 				for(var/atom/A in block(locate(x1,y1,z1),locate(x2,y2,z2)))
-					for(var/obj/O in A) del(O)
+					for(var/obj/O in A) qdel(O)
 					for(var/mob/M in A)
-						if(!M.key) del(M)
+						if(!M.key) qdel(M)
 						else M.loc=null
 					areas[A.loc]=null
 					del(A)
@@ -286,9 +286,9 @@ swapmap
 						A.contents+=T
 					else defarea.contents+=T
 					// clear the turf
-					for(var/obj/O in T) del(O)
+					for(var/obj/O in T) qdel(O)
 					for(var/mob/M in T)
-						if(!M.key) del(M)
+						if(!M.key) qdel(M)
 						else M.loc=null
 					// finish the read
 					T.Read(S)

code/modules/awaymissions/mission_code/academy.dm

@@ -0,0 +1,43 @@
+//Academy Areas
+
+/area/awaymission/academy
+	name = "\improper Academy Asteroids"
+	icon_state = "away"
+
+/area/awaymission/academy/headmaster
+	name = "\improper Academy Fore Block"
+	icon_state = "away1"
+
+/area/awaymission/academy/classrooms
+	name = "\improper Academy Classroom Block"
+	icon_state = "away2"
+
+/area/awaymission/academy/academyaft
+	name = "\improper Academy Ship Aft Block"
+	icon_state = "away3"
+
+/area/awaymission/academy/academygate
+	name = "\improper Academy Gateway"
+	icon_state = "away4"
+
+//Academy Items
+
+/obj/machinery/singularity/academy
+	dissipate = 0
+	move_self = 0
+	grav_pull = 1
+
+/obj/machinery/singularity/academy/admin_investigate_setup()
+	return
+
+/obj/machinery/singularity/academy/process()
+	eat()
+	if(prob(1))
+		mezzer()
+
+
+/obj/item/clothing/glasses/meson/truesight
+	name = "The Lens of Truesight"
+	desc = "I can see forever!"
+	icon_state = "monocle"
+	item_state = "headset"

code/modules/awaymissions/mission_code/blackmarketpackers.dm

@@ -0,0 +1,22 @@
+//Packer Ship Areas
+
+/area/awaymission/BMPship
+	name = "\improper BMP Asteroids"
+	icon_state = "away"
+	luminosity = 0
+
+
+/area/awaymission/BMPship/Aft
+	name = "\improper Aft Block"
+	icon_state = "away1"
+	requires_power = 1
+
+/area/awaymission/BMPship/Midship
+	name = "\improper Midship Block"
+	icon_state = "away2"
+	requires_power = 1
+
+/area/awaymission/BMPship/Fore
+	name = "\improper Fore Block"
+	icon_state = "away3"
+	requires_power = 1

code/modules/awaymissions/mission_code/centcomAway.dm

@@ -0,0 +1,63 @@
+//centcomAway areas
+
+/area/awaymission/centcomAway
+	name = "XCC-P5831"
+	icon_state = "away"
+	requires_power = 0
+
+/area/awaymission/centcomAway/general
+	name = "XCC-P5831"
+	music = "music/ambigen3.ogg"
+
+/area/awaymission/centcomAway/maint
+	name = "XCC-P5831 Maintenance"
+	icon_state = "away1"
+	music = "music/ambisin1.ogg"
+
+/area/awaymission/centcomAway/thunderdome
+	name = "XCC-P5831 Thunderdome"
+	icon_state = "away2"
+	music = "music/ambisin2.ogg"
+
+/area/awaymission/centcomAway/cafe
+	name = "XCC-P5831 Kitchen Arena"
+	icon_state = "away3"
+	music = "music/ambisin3.ogg"
+
+/area/awaymission/centcomAway/courtroom
+	name = "XCC-P5831 Courtroom"
+	icon_state = "away4"
+	music = "music/ambisin4.ogg"
+
+/area/awaymission/centcomAway/hangar
+	name = "XCC-P5831 Hangars"
+	icon_state = "away4"
+	music = "music/ambigen5.ogg"
+
+//centcomAway items
+
+/obj/item/weapon/paper/pamphlet/ccaInfo
+	name = "Visitor Info Pamphlet"
+	info = "<b> XCC-P5831 Visitor Information </b><br>\
+	Greetings, visitor, to  XCC-P5831! As you may know, this outpost was once \
+	used as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \
+	projects across the vastness of space. <br>\
+	Since the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \
+	acts as NT's base of operations but still plays a very important role its corporate affairs; \
+	serving as a supply and repair depot, as well as being host to its most important legal proceedings\
+	and the thrilling pay-per-view broadcasts of <i>PLASTEEL CHEF</i> and <i>THUNDERDOME LIVE</i>.<br> \
+	We hope you enjoy your stay!"
+
+/obj/item/weapon/paper/ccaMemo
+	name = "Memo to XCC-P5831 QM"
+	info = "<b>From: XCC-P5831 Management Office</b><br>\
+	<b>To: Rolf Ingram, XCC-P5831 Quartermaster</b><br>\
+	Hey, Rolf, once you pack that gateway into the ferry hangar, <i>make absolutely sure</i> \
+	to deactivate it! As you may know, SS13 has recently got its network up and running, \
+	which means that until we get this gate shipped off to the next colonization staging \
+	area, they'll be able to hop straight in here if its hooked up on our end.<br>\
+	Obviously, that's something I'd very much rather avoid. Our forensics and medical \
+	teams never did figure out what happened that last time... and I can't wrap my head \
+	around it myself. Why would a shuttle full of evacuees all snap and beat each other \
+	to death the moment they reached safety?<br>\
+	- D. Cereza"

code/modules/awaymissions/mission_code/challenge.dm

@@ -0,0 +1,32 @@
+//Challenge Areas
+
+/area/awaymission/challenge/start
+	name = "Where Am I?"
+	icon_state = "away"
+
+/area/awaymission/challenge/main
+	name = "\improper Danger Room"
+	icon_state = "away1"
+	requires_power = 0
+
+/area/awaymission/challenge/end
+	name = "Administration"
+	icon_state = "away2"
+	requires_power = 0
+
+
+/obj/machinery/power/emitter/energycannon
+	name = "Energy Cannon"
+	desc = "A heavy duty industrial laser"
+	icon = 'icons/obj/singularity.dmi'
+	icon_state = "emitter"
+	anchored = 1
+	density = 1
+
+	use_power = 0
+	idle_power_usage = 0
+	active_power_usage = 0
+
+	active = 1
+	locked = 1
+	state = 2

code/modules/awaymissions/mission_code/clownplanet.dm

@@ -0,0 +1,20 @@
+//Clown Planet Areas
+
+/area/planet/clown
+	name = "\improper Clown Planet"
+	icon_state = "honk"
+	luminosity = 1
+	lighting_use_dynamic = 0
+	requires_power = 0
+	
+/area/awaymission/clownplanet/miningtown
+	name = "\improper Clown Planet - Bananium-o-Rama"
+	icon_state = "away1"
+	luminosity = 1
+	requires_power = 0
+
+/area/awaymission/clownplanet/mine
+	name = "\improper Clown Planet - Bananium-o-Rama Mines"
+	icon_state = "away2"
+	luminosity = 1
+	requires_power = 0

code/modules/awaymissions/mission_code/spacebattle.dm

@@ -0,0 +1,33 @@
+//Spacebattle Areas
+
+/area/awaymission/spacebattle
+	name = "\improper Space Battle"
+	icon_state = "away"
+	requires_power = 0
+
+/area/awaymission/spacebattle/cruiser
+	name = "\improper Nanotrasen Cruiser"
+
+/area/awaymission/spacebattle/syndicate1
+	name = "\improper Syndicate Assault Ship 1"
+
+/area/awaymission/spacebattle/syndicate2
+	name = "\improper Syndicate Assault Ship 2"
+
+/area/awaymission/spacebattle/syndicate3
+	name = "\improper Syndicate Assault Ship 3"
+
+/area/awaymission/spacebattle/syndicate4
+	name = "\improper Syndicate War Sphere 1"
+
+/area/awaymission/spacebattle/syndicate5
+	name = "\improper Syndicate War Sphere 2"
+
+/area/awaymission/spacebattle/syndicate6
+	name = "\improper Syndicate War Sphere 3"
+
+/area/awaymission/spacebattle/syndicate7
+	name = "\improper Syndicate Fighter"
+
+/area/awaymission/spacebattle/secret
+	name = "\improper Hidden Chamber"

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -0,0 +1,198 @@
+/* Station-Collision(sc) away mission map specific stuff
+ *
+ * Notes:
+ *		Feel free to use parts of this map, or even all of it for your own project. Just include me in the credits :)
+ *
+ *		Some of this code unnecessary, but the intent is to add a little bit of everything to serve as examples
+ *		for anyone who wants to make their own stuff.
+ *
+ * Contains:
+ *		Areas
+ *		Landmarks
+ *		Guns
+ *		Safe code hints
+ *		Captain's safe
+ *		Modified Nar-Sie
+ */
+
+/*
+ * Areas
+ */
+ //Gateroom gets its own APC specifically for the gate
+ /area/awaymission/gateroom
+
+ //Library, medbay, storage room
+ /area/awaymission/southblock
+
+ //Arrivals, security, hydroponics, shuttles (since they dont move, they dont need specific areas)
+ /area/awaymission/arrivalblock
+
+ //Crew quarters, cafeteria, chapel
+ /area/awaymission/midblock
+
+ //engineering, bridge (not really north but it doesnt really need its own APC)
+ /area/awaymission/northblock
+
+ //That massive research room
+ /area/awaymission/research
+
+//Syndicate shuttle
+/area/awaymission/syndishuttle
+
+
+/*
+ * Landmarks - Instead of spawning a new object type, I'll spawn the bible using a landmark!
+ */
+/obj/effect/landmark/sc_bible_spawner
+	name = "Safecode hint spawner"
+
+/obj/effect/landmark/sc_bible_spawner/New()
+	var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(src.loc)
+	B.name = "The Holy book of the Geometer"
+	B.deity_name = "Narsie"
+	B.icon_state = "melted"
+	B.item_state = "melted"
+	new /obj/item/weapon/paper/sc_safehint_paper_bible(B)
+	new /obj/item/weapon/pen(B)
+	qdel(src)
+
+/*
+ * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
+ */
+//Captain's retro laser - Fires practice laser shots instead.
+obj/item/weapon/gun/energy/laser/retro/sc_retro
+	name ="retro laser"
+	icon_state = "retro"
+	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
+//	projectile_type = "/obj/item/projectile/practice"
+	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face
+
+//Syndicate sub-machine guns.
+/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r
+
+/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r/New()
+	..()
+	for(var/ammo in magazine.stored_ammo)
+		if(prob(95)) //95% chance
+			magazine.stored_ammo -= ammo
+
+//Barman's shotgun
+/obj/item/weapon/gun/projectile/shotgun/sc_pump
+
+/obj/item/weapon/gun/projectile/shotgun/sc_pump/New()
+	..()
+	for(var/ammo in magazine.stored_ammo)
+		if(prob(95)) //95% chance
+			magazine.stored_ammo -= ammo
+
+//Lasers
+/obj/item/weapon/gun/energy/laser/practice/sc_laser
+	name = "Old laser"
+	desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly."
+	clumsy_check = 0
+
+/*
+ * Safe code hints
+ */
+
+//These vars hold the code itself, they'll be generated at round-start
+var/sc_safecode1 = "[rand(0,9)]"
+var/sc_safecode2 = "[rand(0,9)]"
+var/sc_safecode3 = "[rand(0,9)]"
+var/sc_safecode4 = "[rand(0,9)]"
+var/sc_safecode5 = "[rand(0,9)]"
+
+//Pieces of paper actually containing the hints
+/obj/item/weapon/paper/sc_safehint_paper_prison
+	name = "smudged paper"
+
+/obj/item/weapon/paper/sc_safehint_paper_prison/New()
+	info = "<i>The ink is smudged, you can only make out a couple numbers:</i> '[sc_safecode1]**[sc_safecode4]*'"
+
+/obj/item/weapon/paper/sc_safehint_paper_hydro
+	name = "shredded paper"
+/obj/item/weapon/paper/sc_safehint_paper_hydro/New()
+	info = "<i>Although the paper is shredded, you can clearly see the number:</i> '[sc_safecode2]'"
+
+/obj/item/weapon/paper/sc_safehint_paper_caf
+	name = "blood-soaked paper"
+	//This does not have to be in New() because it is a constant. There are no variables in it i.e. [sc_safcode]
+	info = "<font color=red><i>This paper is soaked in blood, it is impossible to read any text.</i></font>"
+
+/obj/item/weapon/paper/sc_safehint_paper_bible
+	name = "hidden paper"
+/obj/item/weapon/paper/sc_safehint_paper_bible/New()
+	info = {"<i>It would appear that the pen hidden with the paper had leaked ink over the paper.
+			However you can make out the last three digits:</i>'[sc_safecode3][sc_safecode4][sc_safecode5]'
+			"}
+
+/obj/item/weapon/paper/sc_safehint_paper_shuttle
+	info = {"<b>Target:</b> Research-station Epsilon<br>
+			<b>Objective:</b> Prototype weaponry. The captain likely keeps them locked in her safe.<br>
+			<br>
+			Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security
+			Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and
+			secure anything found inside. If possible, recover the imprisioned syndicate operative and recieve the code from him.<br>
+			<br>
+			<u>As always, eliminate anyone who gets in the way.</u><br>
+			<br>
+			Your assigned ship is designed specifically for penetrating the hull of another station or ship with minimal damage to operatives.
+			It is completely fly-by-wire meaning you have just have to enjoy the ride and when the red light comes on... find something to hold onto!
+			"}
+/*
+ * Captain's safe
+ */
+/obj/item/weapon/storage/secure/safe/sc_ssafe
+	name = "Captain's secure safe"
+
+/obj/item/weapon/storage/secure/safe/sc_ssafe/New()
+	..()
+	l_code = "[sc_safecode1][sc_safecode2][sc_safecode3][sc_safecode4][sc_safecode5]"
+	l_set = 1
+	new /obj/item/weapon/gun/energy/mindflayer(src)
+	new /obj/item/device/soulstone(src)
+	new /obj/item/clothing/head/helmet/space/cult(src)
+	new /obj/item/clothing/suit/space/cult(src)
+	//new /obj/item/weapon/teleportation_scroll(src)
+	new /obj/item/weapon/ore/diamond(src)
+
+/*
+ * Modified Nar-Sie
+ */
+/obj/machinery/singularity/narsie/sc_Narsie
+	desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
+	move_self = 0 //Contianed narsie does not move!
+	grav_pull = 0 //Contained narsie does not pull stuff in!
+
+//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
+/obj/machinery/singularity/narsie/sc_Narsie/admin_investigate_setup()
+	return
+
+/obj/machinery/singularity/narsie/sc_Narsie/process()
+	eat()
+	if(prob(25))
+		mezzer()
+
+/obj/machinery/singularity/narsie/sc_Narsie/consume(var/atom/A)
+	if(is_type_in_list(A, uneatable))
+		return 0
+	if (istype(A,/mob/living))
+		var/mob/living/L = A
+		L.gib()
+	else if(istype(A,/obj/))
+		var/obj/O = A
+		O.ex_act(1.0)
+		if(O) qdel(O)
+	else if(isturf(A))
+		var/turf/T = A
+		if(T.intact)
+			for(var/obj/O in T.contents)
+				if(O.level != 1)
+					continue
+				if(O.invisibility == 101)
+					src.consume(O)
+		T.ChangeTurf(/turf/space)
+	return
+
+/obj/machinery/singularity/narsie/sc_Narsie/ex_act()
+	return

code/modules/awaymissions/mission_code/wildwest.dm

@@ -0,0 +1,195 @@
+/* Code for the Wild West map by Brotemis
+ * Contains:
+ *		Wish Granter
+ *		Meat Grinder
+ */
+
+//Wild West Areas
+
+/area/awaymission/wwmines
+	name = "\improper Wild West Mines"
+	icon_state = "away1"
+	luminosity = 1
+	requires_power = 0
+
+/area/awaymission/wwgov
+	name = "\improper Wild West Mansion"
+	icon_state = "away2"
+	luminosity = 1
+	requires_power = 0
+
+/area/awaymission/wwrefine
+	name = "\improper Wild West Refinery"
+	icon_state = "away3"
+	luminosity = 1
+	requires_power = 0
+
+/area/awaymission/wwvault
+	name = "\improper Wild West Vault"
+	icon_state = "away3"
+	luminosity = 0
+
+/area/awaymission/wwvaultdoors
+	name = "\improper Wild West Vault Doors"  // this is to keep the vault area being entirely lit because of requires_power
+	icon_state = "away2"
+	requires_power = 0
+	luminosity = 0
+
+/*
+ * Wish Granter
+ */
+/obj/machinery/wish_granter_dark
+	name = "Wish Granter"
+	desc = "You're not so sure about this, anymore..."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "syndbeacon"
+
+	anchored = 1
+	density = 1
+	use_power = 0
+
+	var/chargesa = 1
+	var/insistinga = 0
+
+/obj/machinery/wish_granter_dark/attack_hand(var/mob/living/carbon/human/user as mob)
+	usr.set_machine(src)
+
+	if(chargesa <= 0)
+		user << "The Wish Granter lies silent."
+		return
+
+	else if(!istype(user, /mob/living/carbon/human))
+		user << "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's."
+		return
+
+	else if(is_special_character(user))
+		user << "Even to a heart as dark as yours, you know nothing good will come of this.  Something instinctual makes you pull away."
+
+	else if (!insistinga)
+		user << "Your first touch makes the Wish Granter stir, listening to you.  Are you really sure you want to do this?"
+		insistinga++
+
+	else
+		chargesa--
+		insistinga = 0
+		var/wish = input("You want...","Wish") as null|anything in list("Power","Wealth","Immortality","To Kill","Peace")
+		switch(wish)
+			if("Power")
+				user << "<B>Your wish is granted, but at a terrible cost...</B>"
+				user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
+				user.mutations.Add(M_LASER)
+				user.mutations.Add(M_RESIST_COLD)
+				user.mutations.Add(M_XRAY)
+				user.dna.mutantrace = "shadow"
+				user.regenerate_icons()
+			if("Wealth")
+				user << "<B>Your wish is granted, but at a terrible cost...</B>"
+				user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
+				new /obj/structure/closet/syndicate/resources/everything(loc)
+				user.dna.mutantrace = "shadow"
+				user.regenerate_icons()
+			if("Immortality")
+				user << "<B>Your wish is granted, but at a terrible cost...</B>"
+				user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
+				user.verbs += /mob/living/carbon/proc/immortality
+				user.dna.mutantrace = "shadow"
+				user.regenerate_icons()
+			if("To Kill")
+				user << "<B>Your wish is granted, but at a terrible cost...</B>"
+				user << "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart."
+				ticker.mode.traitors += user.mind
+				user.mind.special_role = "traitor"
+				var/datum/objective/hijack/hijack = new
+				hijack.owner = user.mind
+				user.mind.objectives += hijack
+				user << "<B>Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!</B>"
+				var/obj_count = 1
+				for(var/datum/objective/OBJ in user.mind.objectives)
+					user << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
+					obj_count++
+				user.dna.mutantrace = "shadow"
+				user.regenerate_icons()
+			if("Peace")
+				user << "<B>Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.</B>"
+				user << "You feel as if you just narrowly avoided a terrible fate..."
+				for(var/mob/living/simple_animal/hostile/faithless/F in world)
+					F.health = -10
+					F.stat = 2
+					F.icon_state = "faithless_dead"
+
+
+///////////////Meatgrinder//////////////
+
+
+/obj/effect/meatgrinder
+	name = "Meat Grinder"
+	desc = "What is that thing?"
+	density = 1
+	anchored = 1
+	layer = 3
+	icon = 'icons/mob/blob.dmi'
+	icon_state = "blobpod"
+	var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
+	var/triggered = 0
+
+/obj/effect/meatgrinder/New()
+	icon_state = "blobpod"
+
+/obj/effect/meatgrinder/Crossed(AM as mob|obj)
+	Bumped(AM)
+
+/obj/effect/meatgrinder/Bumped(mob/M as mob|obj)
+
+	if(triggered) return
+
+	if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))
+		for(var/mob/O in viewers(world.view, src.loc))
+			O << "<font color='red'>[M] triggered the \icon[src] [src]</font>"
+		triggered = 1
+		call(src,triggerproc)(M)
+
+/obj/effect/meatgrinder/proc/triggerrad1(mob)
+	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	for(var/mob/O in viewers(world.view, src.loc))
+		s.set_up(3, 1, src)
+		s.start()
+		explosion(mob, 1, 0, 0, 0)
+		qdel(src)
+
+/*/obj/effect/meatgrinder
+	name = "Meat Grinder"
+	icon_state = "blob"
+	triggerproc = "triggerrad1"*/
+
+
+/////For the Wishgranter///////////
+
+/mob/living/carbon/proc/immortality()
+	set category = "Immortality"
+	set name = "Resurrection"
+
+	var/mob/living/carbon/C = usr
+	if(!C.stat)
+		C << "<span class='notice'>You're not dead yet!</span>"
+		return
+	C << "<span class='notice'>Death is not your end!</span>"
+
+	spawn(rand(800,1200))
+		if(C.stat == DEAD)
+			dead_mob_list -= C
+			living_mob_list += C
+		C.stat = CONSCIOUS
+		C.tod = null
+		C.setToxLoss(0)
+		C.setOxyLoss(0)
+		C.setCloneLoss(0)
+		C.SetParalysis(0)
+		C.SetStunned(0)
+		C.SetWeakened(0)
+		C.radiation = 0
+		C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss())
+		C.reagents.clear_reagents()
+		C << "<span class='notice'>You have regenerated.</span>"
+		C.visible_message("<span class='warning'>[usr] appears to wake from the dead, having healed all wounds.</span>")
+		C.update_canmove()
+	return 1

code/modules/awaymissions/zlevel.dm

@@ -3,8 +3,9 @@ proc/createRandomZlevel()
 		return
 
 	var/list/potentialRandomZlevels = list()
-	world << "\red \b Searching for away missions..."
-	var/list/Lines = file2list("config/fileList.txt")
+	world << "<span class='userdanger'>Searching for away missions...</span>"
+	var/list/Lines = file2list("maps/RandomZLevels/fileList.txt")
+
 	if(!Lines.len)	return
 	for (var/t in Lines)
 		if (!t)
@@ -21,34 +22,33 @@ proc/createRandomZlevel()
 	//	var/value = null
 
 		if (pos)
-            // No, don't do lowertext here, that breaks paths on linux
-			name = copytext(t, 1, pos)
+			name = lowertext(copytext(t, 1, pos))
 		//	value = copytext(t, pos + 1)
 		else
-            // No, don't do lowertext here, that breaks paths on linux
-			name = t
+			name = lowertext(t)
 
 		if (!name)
 			continue
 
-		potentialRandomZlevels.Add(name)
+		potentialRandomZlevels.Add(t)
 
 
 	if(potentialRandomZlevels.len)
-		world << "\red \b Loading away mission..."
+		world << "<span class='userdanger'>Loading away mission...</span>"
 
 		var/map = pick(potentialRandomZlevels)
 		var/file = file(map)
 		if(isfile(file))
-			maploader.load_map(file, load_speed = 100)
+			maploader.load_map(file)
+			world.log << "away mission loaded: [map]"
 
 		for(var/obj/effect/landmark/L in landmarks_list)
 			if (L.name != "awaystart")
 				continue
 			awaydestinations.Add(L)
 
-		world << "\red \b Away mission loaded."
+		world << "<span class='userdanger'>Away mission loaded.</span>"
 
 	else
-		world << "\red \b No away missions found."
+		world << "<span class='userdanger'>No away missions found.</span>"
 		return

code/modules/client/preferences.dm

@@ -15,7 +15,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"cultist" = IS_MODE_COMPILED("cult"),                // 8
 	"plant" = 1,										 // 9
 	"ninja" = "true",									 // 10
-	"vox" = IS_MODE_COMPILED("vox/heist") + IS_MODE_COMPILED("vox/trader"),			 // 11
+	"raider" = IS_MODE_COMPILED("heist"),				 // 11
 	"slime" = 1,                                         // 12
 	"vampire" = IS_MODE_COMPILED("vampire"),			 // 13
 	"mutineer" = IS_MODE_COMPILED("mutiny"),             // 14

code/modules/clothing/spacesuits/ninja.dm

@@ -56,6 +56,7 @@
 		//Ability function variables.
 	var/s_bombs = 10.0//Number of starting ninja smoke bombs.
 	var/a_boost = 3.0//Number of adrenaline boosters.
+	var/emp_proof = 0 // Will the suit react to EMPs? A kind of bad workaround to make Ninjas invulnerable to their own EMPs. - Dave
 
 		//Onboard AI related variables.
 	var/mob/living/silicon/ai/AI//If there is an AI inside the suit.

code/modules/events/alien_infestation.dm

@@ -26,7 +26,7 @@
 			if(temp_vent.network.normal_members.len > 50)	//Stops Aliens getting stuck in small networks. See: Security, Virology
 				vents += temp_vent
 
-	var/list/candidates = get_alien_candidates()
+	var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
 
 	while(spawncount > 0 && vents.len && candidates.len)
 		var/obj/vent = pick(vents)

code/modules/events/borers.dm

@@ -26,7 +26,7 @@
 			if(temp_vent.network.normal_members.len > 50)
 				vents += temp_vent
 
-	var/list/candidates = get_alien_candidates()
+	var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
 	while(spawncount > 0 && vents.len && candidates.len)
 		var/obj/vent = pick_n_take(vents)
 		var/client/C = pick_n_take(candidates)

code/modules/food/cooker.dm

@@ -37,19 +37,10 @@ obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user)
 	if(on)
 		user << "<span class='notice'>[src] is still active!</span>"
 		return 0
-	if(istype(check, /obj/item/weapon/grab) || istype(check, /obj/item/tk_grab))
-		user << "<span class='warning'>That isn't going to fit.</span>"
-		return 0
-	if(istype(check, /obj/item/weapon/reagent_containers/glass))
-		user << "<span class='warning'>That would probably break [src].</span>"
-		return 0
-	if(istype(check, /obj/item/weapon/disk/nuclear))
-		user << "Central command would kill you if you [thiscooktype] that."
-		return 0
-	if(istype(check, /obj/item/flag))
-		user << "<span class='warning'>That isn't going to fit.</span>"
-		return 0
-	return 1
+	if(istype(check, /obj/item/weapon/reagent_containers/food/snacks))
+		return 1
+	user << "<span class ='notice'>You can only process food!</span>"
+	return 0
 
 obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto)
 	copyto.color = foodcolor

code/modules/maps/reader.dm

@@ -1,325 +0,0 @@
-dmm_suite
-
-	var/debug_file = file("maploader_debug.txt")
-
-	load_map(var/dmm_file as file, var/z_offset as num, var/y_offset as num, var/x_offset as num, var/load_speed = 0 as num)
-		if(!z_offset)
-			z_offset = world.maxz + 1
-
-		//Ensure values are sane.
-		else if(z_offset < 0)
-			z_offset = abs(z_offset)
-		else if(!isnum(z_offset))
-			z_offset = 0
-
-		if(x_offset < 0)
-			x_offset = abs(x_offset)
-		else if(!isnum(x_offset))
-			x_offset = 0
-
-		if(y_offset < 0)
-			y_offset = abs(y_offset)
-		else if(!isnum(y_offset))
-			y_offset = 0
-
-		debug_file << "Starting Map Load @ ([x_offset], [y_offset], [z_offset]), [load_speed] tiles per second."
-
-		//Handle slowed loading.
-		var/delay_chance = 0
-		if(load_speed > 0)
-			//Chance out of 100 every tenth of a second.
-			delay_chance = 1000 / load_speed
-
-		//String holding a quotation mark.
-		var/quote = ascii2text(34)
-
-		var/input_file = file2text(dmm_file)
-		var/input_file_len = length(input_file)
-
-		//Stores the contents of each tile model in the map
-		var/list/grid_models = list()
-		//Length of the tile model code.  e.g. "aaa" is 3 long.
-		var/key_len = length(copytext(input_file, 2 ,findtext(input_file, quote, 2)))
-		//The key of the default tile model.  (In SS13 this is: "/turf/space,/area")
-		var/default_key
-
-		debug_file << "	Building turf array."
-
-		//Iterates through the mapfile to build the model tiles for the map.
-		for(var/line_position = 1; line_position < input_file_len; line_position = findtext(input_file,"\n", line_position) + 1)
-			var/next_line = copytext(input_file, line_position, findtext(input_file,"\n", line_position) - 1)
-
-			//If the first character in the line is not a quote, the model tiles are all defined.
-			if(copytext(next_line, 1, 2) != quote)
-				break
-
-			//Copy contents of the model into the grid_models list.
-			var/model_key = copytext(next_line, 2, findtext(input_file, quote, 2))
-			var/model_contents = copytext(next_line, findtext(next_line, "=" ) + 3)
-			if(!default_key && model_contents == "[world.turf],[world.area]")
-				default_key = model_key
-			grid_models[model_key] = model_contents
-			if(prob(delay_chance))
-				sleep(1)
-
-		//Co-ordinates of the tile being loaded.
-		var/z_coordinate = -1
-		var/y_coordinate = 0
-		var/x_coordinate = 0
-
-		//Store the
-		var/y_depth = 0
-
-		//Iterate through all z-levels to load the tiles.
-		for(var/z_position = findtext(input_file, "\n(1,1,"); TRUE; z_position = findtext(input_file, "\n(1,1,", z_position + 1))
-			//break when there are no more z-levels.
-			if(z_position == 0)
-				break
-
-			//Increment the z_coordinate and update the world's borders
-			z_coordinate++
-			world.maxz = max(world.maxz, z_coordinate + z_offset)
-
-			//Here we go!
-			y_coordinate = 0
-			y_depth = 0
-			var/z_level = copytext(input_file, \
-						findtext(input_file, quote + "\n", z_position) + 2,\
-						findtext(input_file, "\n" + quote, z_position) + 1)
-
-			//Iterate through each line, increasing the y_coordinate.
-			for(var/grid_position = 1; grid_position != 0; grid_position = findtext(z_level, "\n", grid_position) + 1)
-				//Grab this line of data.
-				var/grid_line = copytext(z_level, grid_position, findtext(z_level, "\n", grid_position))
-
-				//Compute the size of the z-levels y axis.
-				if(!y_depth)
-					y_depth = length(z_level) / (length(grid_line) + 1)
-					y_depth += y_offset
-					if(y_depth != round(y_depth, 1))
-						debug_file << "	Warning: y_depth is not a round number"
-
-					//And update the worlds variables.
-					if(world.maxy < y_depth)
-						world.maxy = y_depth
-					//The top of the map is the highest "y" co-ordinate, so we start there and iterate downwards
-					if(!y_coordinate)
-						y_coordinate = y_depth + 1
-
-				//Decrement and load this line of the map.
-				y_coordinate--
-				x_coordinate = x_offset
-
-				//Iterate through the line loading the model tile data.
-				for(var/model_position = 1; model_position <= length(grid_line); model_position += key_len)
-					x_coordinate++
-
-					//Find the model key and load that model.
-					var/model_key = copytext(grid_line, model_position, model_position + key_len)
-					//If the key is the default one, skip it and save the computation time.
-					if(model_key == default_key)
-						continue
-
-					if(world.maxx < x_coordinate)
-						world.maxx = x_coordinate
-					parse_grid(grid_models[model_key], x_coordinate, y_coordinate, z_coordinate + z_offset)
-
-					if(prob(delay_chance))
-						sleep(1)
-
-				//If we hit the last tile in this z-level, we should break out of the loop.
-				if(grid_position + length(grid_line) + 1 > length(z_level))
-					break
-
-			//Break out of the loop when we hit the end of the file.
-			if(findtext(input_file, quote + "}", z_position) + 2 >= input_file_len)
-				break
-
-
-	proc/parse_grid(var/model as text, var/x_coordinate as num, var/y_coordinate as num, var/z_coordinate as num)
-		//Accepts a text string containing a comma separated list of type paths of the
-		//  same construction as those contained in a .dmm file, and instantiates them.
-
-		var/list/text_strings = list()
-		for(var/index = 1; findtext(model, quote); index++)
-			/*Loop: Stores quoted portions of text in text_strings, and replaces them with an
-				index to that list.
-				- Each iteration represents one quoted section of text.
-				*/
-			//Add the next section of quoted text to the list
-			var/first_quote = findtext(model, quote)
-			var/second_quote = findtext(model, quote, first_quote + 1)
-			var/quoted_chunk = copytext(model, first_quote + 1, second_quote)
-			text_strings += quoted_chunk
-			//Then remove the quoted section.
-			model = copytext(model, 1, first_quote) + "~[index]" + copytext(model, second_quote + 1)
-
-		var/debug_output = 0
-		//if(x_coordinate == 86 && y_coordinate == 88 && z_coordinate == 7)
-		//	debug_output = 1
-
-		if(debug_output)
-			debug_file << "	Now debugging turf: [model] ([x_coordinate], [y_coordinate], [z_coordinate])"
-
-		var/next_position = 1
-		for(var/data_position = 1, next_position || data_position != 1, data_position = next_position + 1)
-			next_position = findtext(model, ",/", data_position)
-
-			var/full_def = copytext(model, data_position, next_position)
-
-			if(debug_output)
-				debug_file << "		Current Line: [full_def] -- ([data_position] - [next_position])"
-
-			/*Loop: Identifies each object's data, instantiates it, and reconstitues it's fields.
-				- Each iteration represents one object's data, including type path and field values.
-				*/
-
-			//Load the attribute data.
-			var/attribute_position = findtext(full_def,"{")
-			var/atom_def = text2path(copytext(full_def, 1, attribute_position))
-
-			var/list/attributes = list()
-			if(attribute_position)
-				full_def = copytext(full_def, attribute_position + 1)
-				if(debug_output)
-					debug_file << "		Atom Def: [atom_def]"
-					debug_file << "		Parameters: [full_def]"
-
-				var/next_attribute = 1
-				for(attribute_position = 1, next_attribute || attribute_position != 1, attribute_position = next_attribute + 1)
-					next_attribute = findtext(full_def, ";", attribute_position)
-
-					//Loop: Identifies each attribute/value pair, and stores it in attributes[].
-					attributes +=  copytext(full_def, attribute_position, next_attribute)
-
-			//Construct attributes associative list
-			var/list/fields = list()
-			for(var/attribute in attributes)
-				var/trim_left = trim_text(copytext(attribute, 1, findtext(attribute, "=")))
-				var/trim_right = trim_text(copytext(attribute, findtext(attribute, "=") + 1))
-
-				if(findtext(trim_right, "list("))
-					trim_right = get_list(trim_right, text_strings)
-
-				else if(findtext(trim_right, "~"))//Check for strings
-					while(findtext(trim_right,"~"))
-						var/reference_index = copytext(trim_right, findtext(trim_right, "~") + 1)
-						trim_right = text_strings[text2num(reference_index)]
-
-				//Check for numbers
-				else if(isnum(text2num(trim_right)))
-					trim_right = text2num(trim_right)
-
-				//Check for file
-				else if(copytext(trim_right,1,2) == "'")
-					trim_right = file(copytext(trim_right, 2, length(trim_right)))
-
-				fields[trim_left] = trim_right
-				sleep(-1)
-
-
-			if(debug_output)
-				var/return_data = "		Debug Fields:"
-				for(var/item in fields)
-					return_data += " [item] = [fields[item]];"
-				debug_file << return_data
-
-			//Begin Instanciation
-			var/atom/instance
-
-			if(ispath(atom_def,/area))
-				instance = locate(atom_def)
-				if(!istype(instance, atom_def))
-					instance = new atom_def
-				instance.contents.Add(locate(x_coordinate,y_coordinate,z_coordinate))
-
-			else
-				instance = new atom_def(locate(x_coordinate,y_coordinate,z_coordinate))
-				if(instance)
-					for(var/item in fields)
-						instance.vars[item] = fields[item]
-				else if(!(atom_def in borked_paths))
-					borked_paths += atom_def
-					var/return_data = "	Failure [atom_def] @ ([x_coordinate], [y_coordinate], [z_coordinate])  fields:"
-					for(var/item in fields)
-						return_data += " [item] = [fields[item]];"
-					debug_file << return_data
-
-			sleep(-1)
-		return 1
-
-	var/list/borked_paths = list()
-
-	proc/trim_text(var/what as text)
-		while(length(what) && findtext(what, " ", 1, 2))
-			what = copytext(what, 2)
-
-		while(length(what) && findtext(what, " ", length(what)))
-			what = copytext(what, 1, length(what))
-
-		return what
-
-	proc/get_list(var/text, var/list/text_strings)
-		//First, trim the data to just the list contents
-		var/list_start = findtext(text, "(") + 1
-		var/list_end = findtext(text, ")", list_start)
-		var/list_contents = copytext(text, list_start, list_end)
-
-		//Then, we seperate it into the individual entries
-
-		var/list/entries = list()
-		var/entry_end = 1
-
-		for(var/entry_start = 1, entry_end || entry_start != 1, entry_start = entry_end + 1)
-			entry_end = findtext(list_contents, ",", entry_start)
-			entries += copytext(list_contents, entry_start, entry_end)
-
-		//Finally, we assemble the completed list.
-		var/list/final_list = list()
-		for(var/entry in entries)
-			var/equals_position = findtext(entry, "=")
-
-			if(equals_position)
-				var/trim_left = trim_text(copytext(entry, 1, equals_position))
-				var/trim_right = trim_text(copytext(entry, equals_position + 1))
-
-				if(findtext(trim_right, "list("))
-					trim_right = get_list(trim_right, text_strings)
-
-				else if(findtext(trim_right, "~"))//Check for strings
-					while(findtext(trim_right,"~"))
-						var/reference_index = copytext(trim_right, findtext(trim_right, "~") + 1)
-						trim_right = text_strings[text2num(reference_index)]
-
-				//Check for numbers
-				else if(isnum(text2num(trim_right)))
-					trim_right = text2num(trim_right)
-
-				//Check for file
-				else if(copytext(trim_right,1,2) == "'")
-					trim_right = file(copytext(trim_right, 2, length(trim_right)))
-
-				if(findtext(trim_left, "~"))//Check for strings
-					while(findtext(trim_left,"~"))
-						var/reference_index = copytext(trim_left, findtext(trim_left, "~") + 1)
-						trim_left = text_strings[text2num(reference_index)]
-
-				final_list[trim_left] = trim_right
-
-			else
-				if(findtext(entry, "~"))//Check for strings
-					while(findtext(entry, "~"))
-						var/reference_index = copytext(entry, findtext(entry, "~") + 1)
-						entry = text_strings[text2num(reference_index)]
-
-				//Check for numbers
-				else if(isnum(text2num(entry)))
-					entry = text2num(entry)
-
-				//Check for file
-				else if(copytext(entry, 1, 2) == "'")
-					entry = file(copytext(entry, 2, length(entry)))
-
-				final_list += entry
-
-		return final_list

code/modules/mining/mine_items.dm

@@ -93,7 +93,7 @@
 		name = "sonic jackhammer"
 		icon_state = "jackhammer"
 		item_state = "jackhammer"
-		digspeed = 20 //faster than drill, but cannot dig
+		digspeed = 15 //faster than drill, but cannot dig
 		origin_tech = "materials=3;powerstorage=2;engineering=2"
 		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
 
@@ -140,7 +140,7 @@
 
 	borgdrill
 		name = "cyborg mining drill"
-		icon_state = "diamonddrill"
+		icon_state = "jackhammer"
 		item_state = "jackhammer"
 		digspeed = 15
 		desc = ""

code/modules/mob/living/carbon/alien/alien.dm

@@ -278,6 +278,9 @@ Des: Removes all infected images from the alien.
 
 /mob/living/carbon/alien/larva/updatePlasmaDisplay()
 	return
+	
+/mob/living/carbon/alien/can_use_vents()
+	return
 
 #undef HEAT_DAMAGE_LEVEL_1
 #undef HEAT_DAMAGE_LEVEL_2

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -53,13 +53,13 @@
 /mob/living/carbon/alien/humanoid/movement_delay()
 	var/tally = 0
 	if (istype(src, /mob/living/carbon/alien/humanoid/queen))
-		tally += 4
+		tally += 5
 	if (istype(src, /mob/living/carbon/alien/humanoid/drone))
-		tally += 0
+		tally += 1
 	if (istype(src, /mob/living/carbon/alien/humanoid/sentinel))
-		tally += 0
+		tally += 1
 	if (istype(src, /mob/living/carbon/alien/humanoid/hunter))
-		tally = -2 // hunters go supersuperfast
+		tally = -1 // hunters go supersuperfast
 	return (tally + move_delay_add + config.alien_delay)
 
 /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)

code/modules/mob/living/carbon/carbon.dm

@@ -229,20 +229,16 @@
 /mob/living/carbon/proc/eyecheck()
 	return 0
 
-// ++++ROCKDTBEN++++ MOB PROCS -- Ask me before touching.
-// Stop! ... Hammertime! ~Carn
-
 /mob/living/carbon/proc/getDNA()
 	return dna
 
 /mob/living/carbon/proc/setDNA(var/datum/dna/newDNA)
 	dna = newDNA
 
-// ++++ROCKDTBEN++++ MOB PROCS //END
-
-
-
-/mob/living/carbon/proc/handle_ventcrawl(var/obj/machinery/atmospherics/unary/vent_pump/vent_found = null) // -- TLE -- Merged by Carn
+/mob/living/carbon/can_use_vents()
+	return
+	
+/mob/living/proc/handle_ventcrawl(var/obj/machinery/atmospherics/unary/vent_pump/vent_found = null, var/ignore_items = 0) // -- TLE -- Merged by Carn
 	if(stat)
 		src << "You must be conscious to do this!"
 		return
@@ -250,6 +246,11 @@
 		src << "You can't vent crawl while you're stunned!"
 		return
 
+	var/special_fail_msg = can_use_vents()
+	if(special_fail_msg)
+		src << "\red [special_fail_msg]"
+		return
+
 	if(vent_found) // one was passed in, probably from vent/AltClick()
 		if(vent_found.welded)
 			src << "That vent is welded shut."
@@ -264,9 +265,11 @@
 	if(!vent_found)
 		src << "You'll need a non-welded vent to crawl into!"
 		return
+
 	if(!vent_found.network || !vent_found.network.normal_members.len)
 		src << "This vent is not connected to anything."
 		return
+
 	var/list/vents = list()
 	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in vent_found.network.normal_members)
 		if(temp_vent.welded)
@@ -289,16 +292,18 @@
 		return
 
 	var/obj/selection = input("Select a destination.", "Duct System") as null|anything in sortAssoc(vents)
-	if(!selection)  return
+	if(!selection)	return
 
 	if(!vent_found.Adjacent(src))
 		src << "Never mind, you left."
 		return
 
-	for(var/obj/item/carried_item in contents)//If the monkey got on objects.
-		if( !istype(carried_item, /obj/item/weapon/implant) && !istype(carried_item, /obj/item/clothing/mask/facehugger) )//If it's not an implant or a facehugger
-			src << "\red You can't be carrying items or have items equipped when vent crawling!"
-			return
+	if(!ignore_items)
+		for(var/obj/item/carried_item in contents)//If the monkey got on objects.
+			if( !istype(carried_item, /obj/item/weapon/implant) && !istype(carried_item, /obj/item/clothing/mask/facehugger) )//If it's not an implant or a facehugger
+				src << "\red You can't be carrying items or have items equipped when vent crawling!"
+				return
+
 	if(isslime(src))
 		var/mob/living/carbon/slime/S = src
 		if(S.Victim)
@@ -317,23 +322,21 @@
 
 	spawn(travel_time)
 
-		if(!target_vent)  return
+		if(!target_vent)	return
 		for(var/mob/O in hearers(target_vent,null))
 			O.show_message("You hear something squeezing through the ventilation ducts.",2)
 
 		sleep(travel_time)
 
-		if(!target_vent)  return
-		if(target_vent.welded)      //the vent can be welded while alien scrolled through the list or travelled.
-			target_vent = vent_found   //travel back. No additional time required.
+		if(!target_vent)	return
+		if(target_vent.welded)			//the vent can be welded while alien scrolled through the list or travelled.
+			target_vent = vent_found 	//travel back. No additional time required.
 			src << "\red The vent you were heading to appears to be welded."
 		loc = target_vent.loc
 		var/area/new_area = get_area(loc)
 		if(new_area)
 			new_area.Entered(src)
 
-
-
 /mob/living/carbon/clean_blood()
 	. = ..()
 	if(ishuman(src))

code/modules/mob/living/carbon/human/death.dm

@@ -112,14 +112,10 @@
 
 	callHook("death", list(src, gibbed))
 
-	//Check for heist mode kill count.
-	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/vox/heist) || istype( ticker.mode,/datum/game_mode/vox/trade) ) )
-		//Check for last assailant's mutantrace.
-		/*if( LAssailant && ( istype( LAssailant,/mob/living/carbon/human ) ) )
-			var/mob/living/carbon/human/V = LAssailant
-			if (V.dna && (V.dna.mutantrace == "vox"))*/ //Not currently feasible due to terrible LAssailant tracking.
-		//world << "Vox kills: [vox_kills]"
-		vox_kills++ //Bad vox. Shouldn't be killing humans.
+	if(ticker && ticker.mode)
+		if(istype(ticker.mode,/datum/game_mode/heist))
+			vox_kills++ //Bad vox. Shouldn't be killing humans.
+		
 	if(ishuman(LAssailant))
 		var/mob/living/carbon/human/H=LAssailant
 		if(H.mind)

code/modules/mob/living/carbon/human/human_damage.dm

@@ -23,12 +23,14 @@
 				mob_list += src
 				stat = CONSCIOUS
 				ear_deaf = 0
+				tod = 0
 	if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
 		mob_list -= src
 		dead_mob_list -= src
 		living_mob_list += src
 		mob_list += src		
 		ear_deaf = 0
+		tod = 0
 	return
 
 /mob/living/carbon/human/getBrainLoss()

code/modules/mob/living/carbon/human/human_movement.dm

@@ -14,13 +14,14 @@
 	if((M_RUN in mutations)) return -1
 
 	var/health_deficiency = (100 - health + staminaloss)
-
-	if(health_deficiency >= 40) tally += (health_deficiency / 25)
+	if(health_deficiency >= 40)
+		tally += (health_deficiency / 25)
 
 	if(halloss >= 10) tally += (halloss / 10)
 
 	var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80
-	if (hungry >= 70) tally += hungry/50
+	if (hungry >= 70)
+		tally += hungry/50
 
 	if(wear_suit)
 		tally += wear_suit.slowdown

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -613,6 +613,11 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 			Target = null
 			++Discipline
 	return
+	
+/mob/living/carbon/slime/can_use_vents()
+	if(Victim)
+		return "You cannot ventcrawl while feeding."
+	..()
 
 /obj/item/slime_extract
 	name = "slime extract"

code/modules/mob/living/carbon/species.dm

@@ -443,10 +443,9 @@
 	affected.implants += I
 	I.part = affected
 
-	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/vox/heist ) ) )
-		var/datum/game_mode/vox/heist/M = ticker.mode
+	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/heist ) ) )
+		var/datum/game_mode/heist/M = ticker.mode
 		M.cortical_stacks += I
-		M.raiders[H.mind] = I
 
 
 

code/modules/mob/living/living.dm

@@ -757,3 +757,6 @@
 	else if(!on && floating)
 		animate(src, pixel_y = initial(pixel_y), time = 10)
 		floating = 0
+		
+/mob/living/proc/can_use_vents()
+	return "You can't fit into that vent."

code/modules/mob/living/silicon/ai/ai.dm

@@ -63,7 +63,7 @@ var/list/ai_list = list()
 	var/obj/item/borg/sight/hud/sec/sechud = null
 	var/obj/item/borg/sight/hud/med/healthhud = null
 	
-	var/arrivalmsg = "$name, $rank has arrived on the station."
+	var/arrivalmsg = "$name, $rank, has arrived on the station."
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names

code/modules/mob/living/silicon/pai/death.dm

@@ -1,13 +1,15 @@
 /mob/living/silicon/pai/death(gibbed)
 	if(stat == DEAD)	return
-	var/turf/T = get_turf_or_move(loc)
-	for (var/mob/M in viewers(T))
-		M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
-	var/obj/effect/decal/cleanable/deadpai = new /obj/effect/decal/cleanable/robot_debris(loc)
 	if(canmove || resting)
-		deadpai.icon = 'icons/mob/pai.dmi'
-		deadpai.icon_state = "[chassis]_dead"
-	del(src)
+		var/turf/T = get_turf_or_move(loc)
+		for (var/mob/M in viewers(T))
+			M.show_message("\red [src] emits a dull beep before it loses power and collapses.", 3, "\red You hear a dull beep followed by the sound of glass crunching.", 2)
+		name = "pAI debris"
+		desc = "The unfortunate remains of some poor personal AI device."
+		icon_state = "[chassis]_dead"
+	else
+		card.overlays.Cut()
+		card.overlays += "pai-off"
 	stat = DEAD
 	canmove = 0
 	if(blind)	blind.layer = 0
@@ -23,3 +25,5 @@
 	if(mind)	del(mind)
 	living_mob_list -= src
 	ghostize()
+	if(icon_state != "[chassis]_dead")
+		del(src)

code/modules/mob/living/silicon/pai/pai.dm

@@ -24,6 +24,7 @@
 		"Cat" = "cat",
 		"Mouse" = "mouse",
 		"Monkey" = "monkey",
+		"Corgi" = "corgi",
 		"Fox" = "fox"
 		)
 
@@ -80,7 +81,6 @@
 		if(!card.radio)
 			card.radio = new /obj/item/device/radio(src.card)
 		radio = card.radio
-
 	//Verbs for pAI mobile form, chassis and Say flavor text
 	verbs += /mob/living/silicon/pai/proc/choose_chassis
 	verbs += /mob/living/silicon/pai/proc/choose_verbs
@@ -174,16 +174,16 @@
 
 	switch(severity)
 		if(1.0)
-			if (src.stat != 2)
-				adjustBruteLoss(100)
-				adjustFireLoss(100)
+			if (src.stat != 2) //Let's not have two of these instantly kill you.
+				adjustBruteLoss(45)
+				adjustFireLoss(45)
 		if(2.0)
 			if (src.stat != 2)
-				adjustBruteLoss(60)
-				adjustFireLoss(60)
+				adjustBruteLoss(30)
+				adjustFireLoss(30)
 		if(3.0)
 			if (src.stat != 2)
-				adjustBruteLoss(30)
+				adjustBruteLoss(20)
 
 	src.updatehealth()
 
@@ -200,8 +200,6 @@
 		src.updatehealth()
 	return
 
-//mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
-
 /mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
 	if (!ticker)
 		M << "You cannot attack people before the game has started."
@@ -236,8 +234,6 @@
 						O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
 	return
 
-///mob/living/silicon/pai/attack_hand(mob/living/carbon/M as mob)
-
 /mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
 	usr:cameraFollow = null
 	if (!C)
@@ -412,19 +408,22 @@
 		src.updatehealth()
 	else
 		visible_message("<span class='warning'>[user.name] bonks [src] harmlessly with [W].</span>")
-	if(stat != 2) close_up()
+	spawn(1)
+		if(stat != 2)
+			close_up()
 	return
 
 /mob/living/silicon/pai/attack_hand(mob/user as mob)
 	if(stat == 2) return
 	visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
-	close_up()
+	spawn(1)
+		close_up()
 
 //I'm not sure how much of this is necessary, but I would rather avoid issues.
 /mob/living/silicon/pai/proc/close_up()
 
 	last_special = world.time + 200
-
+	resting = 0
 	if(src.loc == card)
 		return
 
@@ -443,10 +442,18 @@
 	canmove = 0
 	icon_state = "[chassis]"
 
-/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+/mob/living/silicon/pai/Bump(atom/movable/AM as mob|obj, yes)
+	return
 
+/mob/living/silicon/pai/Bumped(AM as mob|obj)
+	return
+
+/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+	if(stat || sleeping || paralysis || weakened)
+		return
 	if(istype(AM,/obj/item))
 		src << "<span class='warning'>You are far too small to pull anything!</span>"
+	return
 
 /mob/living/silicon/pai/examine()
 
@@ -479,6 +486,7 @@
 	..(Proj)
 	updatehealth()
 	if (stat != 2)
-		close_up()
+		spawn(1)
+			close_up()
 	return 2
 

code/modules/mob/living/silicon/robot/robot.dm

@@ -72,7 +72,7 @@
 	var/base_icon = ""
 	var/crisis = 0
 	var/hiddenborg = 0
-	
+
 	var/obj/item/borg/sight/hud/sec/sechud = null
 	var/obj/item/borg/sight/hud/med/healthhud = null
 
@@ -188,7 +188,7 @@
 /mob/living/silicon/robot/proc/pick_module()
 	if(module)
 		return
-	var/list/modules = list("Standard", "Engineering", "Construction", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security")
+	var/list/modules = list("Standard", "Engineering", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Security")
 	if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
@@ -218,7 +218,7 @@
 			module_sprites["Bro"] = "Brobot"
 			module_sprites["Rich"] = "maximillion"
 			module_sprites["Default"] = "Service2"
-
+/*
 		if("Clerical")
 			module = new /obj/item/weapon/robot_module/clerical(src)
 			channels = list("Service" = 1)
@@ -227,7 +227,7 @@
 			module_sprites["Bro"] = "Brobot"
 			module_sprites["Rich"] = "maximillion"
 			module_sprites["Default"] = "Service2"
-
+*/
 		if("Miner")
 			module = new /obj/item/weapon/robot_module/miner(src)
 			channels = list("Supply" = 1)
@@ -275,15 +275,6 @@
 			module_sprites["Antique"] = "engineerrobot"
 			module_sprites["Landmate"] = "landmate"
 
-		if("Construction")
-			module = new /obj/item/weapon/robot_module/construction(src)
-			channels = list("Engineering" = 1)
-			if(camera && "Robots" in camera.network)
-				camera.network.Add("Engineering")
-			module_sprites["Basic"] = "Engineering"
-			module_sprites["Antique"] = "engineerrobot"
-			module_sprites["Landmate"] = "landmate"
-
 		if("Janitor")
 			module = new /obj/item/weapon/robot_module/janitor(src)
 			module_sprites["Basic"] = "JanBot2"
@@ -294,6 +285,7 @@
 			module = new /obj/item/weapon/robot_module/combat(src)
 			module_sprites["Combat Android"] = "droid-combat"
 			channels = list("Security" = 1)
+
 		if("Hunter")
 			updatename(module)
 			module = new /obj/item/weapon/robot_module/alien/hunter(src)
@@ -458,12 +450,12 @@
 	else
 		C.toggled = 1
 		src << "\red You enable [C.name]."
-		
+
 /mob/living/silicon/robot/verb/control_hud()
 	set name = "Set Sensor Augmentation"
 	set desc = "Augment visual feed with internal sensor overlays."
 	set category = "Robot Commands"
-	toggle_sensor_mode()	
+	toggle_sensor_mode()
 
 /mob/living/silicon/robot/blob_act()
 	if (stat != 2)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -68,7 +68,7 @@
 		src.modules += new /obj/item/weapon/wrench(src)
 		src.modules += new /obj/item/weapon/crowbar(src)
 		src.modules += new /obj/item/device/healthanalyzer(src)
-		src.emag = new /obj/item/weapon/melee/energy/sword(src)
+		src.emag = new /obj/item/weapon/melee/energy/sword/cyborg(src)
 		return
 
 /obj/item/weapon/robot_module/surgeon
@@ -155,26 +155,6 @@
 
 	..()
 
-/obj/item/weapon/robot_module/construction
-	name = "construction robot module"
-
-	stacktypes = list(
-		/obj/item/stack/sheet/metal = 50,
-		/obj/item/stack/sheet/plasteel = 10,
-		/obj/item/stack/sheet/rglass = 50
-		)
-
-	New()
-		src.modules += new /obj/item/device/flashlight(src)
-		src.modules += new /obj/item/device/flash/cyborg(src)
-		src.modules += new /obj/item/borg/sight/meson(src)
-		src.modules += new /obj/item/weapon/extinguisher(src)
-		src.modules += new /obj/item/weapon/rcd/borg(src)
-		src.modules += new /obj/item/weapon/screwdriver(src)
-		src.modules += new /obj/item/weapon/wrench(src)
-		src.modules += new /obj/item/weapon/crowbar(src)
-		src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
-
 /obj/item/weapon/robot_module/engineering
 	name = "engineering robot module"
 
@@ -191,6 +171,7 @@
 		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/borg/sight/meson(src)
+		src.modules += new /obj/item/weapon/rcd/borg(src)
 		src.modules += new /obj/item/weapon/extinguisher(src)
 		src.modules += new /obj/item/weapon/weldingtool/largetank(src)
 		src.modules += new /obj/item/weapon/screwdriver(src)
@@ -222,6 +203,14 @@
 		W.amount = 50
 		src.modules += W
 
+		var/obj/item/stack/rods/Q = new /obj/item/stack/rods(src)
+		Q.amount = 15
+		src.modules += Q
+
+		var/obj/item/stack/tile/plasteel/F = new /obj/item/stack/tile/plasteel(src) //floor tiles not regular plasteel, calm down
+		F.amount = 15
+		src.modules += F
+
 		return
 
 /obj/item/weapon/robot_module/security
@@ -269,6 +258,9 @@
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
+		src.modules += new /obj/item/weapon/pen(src)
+		src.modules += new /obj/item/weapon/razor(src)
+		src.modules += new /obj/item/device/violin(src)
 
 		var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
 		M.matter = 30
@@ -287,8 +279,15 @@
 		src.emag.name = "Mickey Finn's Special Brew"
 		return
 
+/obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R)
+	var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
+	E.reagents.add_reagent("enzyme", 2)
+	if(src.emag)
+		var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = src.emag
+		B.reagents.add_reagent("beer2", 2)
 
-/obj/item/weapon/robot_module/clerical
+/*
+/obj/item/weapon/robot_module/clerical //Whyyyyy?
 	name = "clerical robot module"
 
 	New()
@@ -300,20 +299,14 @@
 		src.modules += new /obj/item/weapon/gripper/paperwork(src)
 
 		src.emag = new /obj/item/weapon/stamp/denied(src)
-
-/obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R)
-	var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
-	E.reagents.add_reagent("enzyme", 2)
-	if(src.emag)
-		var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = src.emag
-		B.reagents.add_reagent("beer2", 2)
+*/
 
 /obj/item/weapon/robot_module/miner
 	name = "miner robot module"
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flashlight/lantern(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.modules += new /obj/item/weapon/wrench(src)
@@ -321,7 +314,7 @@
 		src.modules += new /obj/item/weapon/storage/bag/ore(src)
 		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
 		src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
-		src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
+		src.emag = new /obj/item/borg/stun(src)
 		return
 
 /obj/item/weapon/robot_module/deathsquad

code/modules/mob/living/silicon/robot/robot_movement.dm

@@ -1,5 +1,5 @@
 /mob/living/silicon/robot/Process_Spaceslipping(var/prob_slip)
-	if(module && (istype(module,/obj/item/weapon/robot_module/construction) || istype(module,/obj/item/weapon/robot_module/drone)))
+	if(module && (istype(module,/obj/item/weapon/robot_module/drone)))
 		return 0
 	..(prob_slip)
 
@@ -23,4 +23,4 @@
 	return tally+config.robot_delay
 
 /mob/living/silicon/robot/Move()
-	..()	
+	..()

code/modules/mob/living/simple_animal/borer.dm

@@ -479,48 +479,12 @@ mob/living/simple_animal/borer/proc/detatch()
 	host.status_flags |= PASSEMOTES
 
 /mob/living/simple_animal/borer/verb/ventcrawl()
-	set name = "Crawl through Vent"
+	set name = "Crawl through vent (borer)"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Alien"
-
-//	if(!istype(V,/obj/machinery/atmoalter/siphs/fullairsiphon/air_vent))
-//		return
-	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
-	var/welded = 0
-	for(var/obj/machinery/atmospherics/unary/vent_pump/v in range(1,src))
-		if(!v.welded)
-			vent_found = v
-			break
-		else
-			welded = 1
-	if(vent_found)
-		if(vent_found.network&&vent_found.network.normal_members.len)
-			var/list/vents = list()
-			for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in vent_found.network.normal_members)
-				if(temp_vent.loc == loc)
-					continue
-				vents.Add(temp_vent)
-			var/list/choices = list()
-			for(var/obj/machinery/atmospherics/unary/vent_pump/vent in vents)
-				if(vent.loc.z != loc.z)
-					continue
-				var/atom/a = get_turf(vent)
-				choices.Add(a.loc)
-			var/turf/startloc = loc
-			var/obj/selection = input("Select a destination.", "Duct System") in choices
-			var/selection_position = choices.Find(selection)
-			if(loc==startloc)
-				var/obj/target_vent = vents[selection_position]
-				if(target_vent)
-					loc = target_vent.loc
-			else
-				src << "\blue You need to remain still while entering a vent."
-		else
-			src << "\blue This vent is not connected to anything."
-	else if(welded)
-		src << "\red That vent is welded."
-	else
-		src << "\blue You must be standing on or beside an air vent to enter it."
+	handle_ventcrawl()
+	
+/mob/living/simple_animal/borer/can_use_vents()
 	return
 
 //Procs for grabbing players.

code/modules/mob/living/ventcrawl.dm

@@ -1,81 +0,0 @@
-/mob/living/proc/handle_ventcrawl()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/V in range(src,1))
-		if(V.welded) continue
-		src.Move(V)
-		return
-	src << "You can only enter an unwelded vent!"
-
-/obj/machinery/atmospherics/relaymove(mob/user as mob,var/mdir)
-	if(!anchored)
-		user.loc = get_turf(src.loc)
-		return
-	if(user.stat || !isturf(src.loc))
-		return
-	if(!(mdir&initialize_directions))
-		visible_message(pick("clang","CLANG","Clang","clong","CLONG","Clong","tink","tak","tok","DOK","DAK"))
-		user << "donk" // find the user and put a donk on it
-		user.Stun(1)
-		return
-	var/turf/T = get_step(loc,mdir)
-	var/fromdir = turn(mdir,180)
-	for(var/obj/machinery/atmospherics/OMA in T)
-		if(!(OMA.initialize_directions&fromdir))
-			continue
-		user.Move(OMA)
-		return
-	user.Move(T) // broken pipe
-
-/obj/machinery/atmospherics/Entered(mob/M)
-	if(istype(M) && M.client)
-		M.client.perspective = EYE_PERSPECTIVE
-		M.client.eye = loc
-
-/obj/machinery/atmospherics/unary/vent_pump/Entered(mob/user, atom/oldloc)
-	if(istype(oldloc, /obj/machinery/atmospherics)) // this is a unary device, came from a pipe rather than the world
-		if(welded)
-			user << "\red [src] is welded shut!"
-			return ..()
-		user.Move(loc)
-		user.visible_message("\blue [user] scrambles out of [src].")
-		if(user.client)
-			user.client.perspective = MOB_PERSPECTIVE
-			user.client.eye = user
-	return ..()
-
-/obj/machinery/atmospherics/binary/pump/Enter(mob/M,atom/oldloc)
-	if(stat || !on) return 1
-	if(get_dir(src,oldloc) == dir) // output
-		M << "You can't move against the flow of [src]!"
-		return 0
-	return 1
-/obj/machinery/atmospherics/binary/pump/Entered(mob/living/M as mob)
-	if(on)
-		M << "[src] spits you violently out the other side!"
-		M.apply_damage(5)
-		src.relaymove(M,dir)
-	return ..()
-
-/obj/machinery/atmospherics/binary/volume_pump/Enter(mob/M,atom/oldloc)
-	if(stat || !on) return 1
-	if(get_dir(src,oldloc) == dir) // output
-		M << "You can't move against the flow of [src]!"
-		return 0
-	return 1
-/obj/machinery/atmospherics/binary/volume_pump/Entered(mob/living/M as mob)
-	if(on)
-		M << "[src] spits you violently out the other side!"
-		M.apply_damage(5)
-		src.relaymove(M,dir)
-	return ..()
-
-/obj/machinery/atmospherics/valve/Enter(mob/M,atom/oldloc)
-	if(!stat && !open)
-		M << "You can't get past [src]."
-		return 0
-	return 1
-
-
-/obj/machinery/atmospherics/Del()
-	for(var/atom/movable/AM in src)
-		AM.loc = loc
-	..()

code/modules/mob/mob.dm

@@ -1212,9 +1212,9 @@ mob/proc/yank_out_object()
 
 
 
-/mob/verb/respawn()
+/mob/dead/observer/verb/respawn()
 	set name = "Respawn as NPC"
-	set category = "OOC"
+	set category = "Ghost"
 
 	if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer)))
 		var/list/creatures = list("Mouse")

code/modules/mob/mob_movement.dm

@@ -245,14 +245,14 @@
 			if("run")
 				if(mob.drowsyness > 0)
 					move_delay += 6
-				move_delay += 1+config.run_speed
+				move_delay += config.run_speed
 			if("walk")
-				move_delay += 7+config.walk_speed
+				move_delay += config.walk_speed
 		move_delay += mob.movement_delay()
 
 		if(config.Tickcomp)
 			move_delay -= 1.3
-			var/tickcomp = ((1/(world.tick_lag))*1.3)
+			var/tickcomp = (1 / (world.tick_lag)) * 1.3
 			move_delay = move_delay + tickcomp
 
 		if(istype(mob.buckled, /obj/vehicle) || istype(mob.buckled, /obj/structure/stool/bed/chair/cart))

code/modules/mob/transform_procs.dm

@@ -432,12 +432,13 @@
 		return 1 //Parrots are no longer unfinished! -Nodrak
 	if(ispath(MP, /mob/living/simple_animal/pony))
 		return 1 // ZOMG PONIES WHEEE
+	if(ispath(MP, /mob/living/simple_animal/fox))
+		return 1 		
 	//Not in here? Must be untested!
 	return 0
 
 
 /mob/proc/safe_respawn(var/MP)
-//Bad mobs! - Remember to add a comment explaining what's wrong with the mob
 	if(!MP)
 		return 0	//Sanity, this should never happen.
 
@@ -456,6 +457,8 @@
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/pony))
 		return 1
+	if(ispath(MP, /mob/living/simple_animal/fox))
+		return 1 	
 
 //Antag Creatures!
 /*	if(ispath(MP, /mob/living/simple_animal/hostile/carp))

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -3112,7 +3112,7 @@
         name = "ice cream cone"
         desc = "Delicious ice cream."
         icon_state = "icecream_cone"
-        volume = 500
+        volume = 50
         New()
                 ..()
                 reagents.add_reagent("nutriment", 2)
@@ -3124,7 +3124,7 @@
         name = "chocolate ice cream cone"
         desc = "Delicious ice cream."
         icon_state = "icecream_cup"
-        volume = 500
+        volume = 50
         New()
                 ..()
                 reagents.add_reagent("nutriment", 4)
@@ -3140,7 +3140,7 @@
 	bitesize = 2
 	New()
 		..()
-		reagents.add_reagent("nutriment", 30)
+		reagents.add_reagent("nutriment", 3)
 /obj/item/weapon/reagent_containers/food/snacks/deepfryholder
 	name = "Deep Fried Foods Holder Obj"
 	desc = "If you can see this description the code for the deep fryer fucked up."
@@ -3149,7 +3149,7 @@
 	bitesize = 2
 	New()
 		..()
-		reagents.add_reagent("nutriment", 30)
+		reagents.add_reagent("nutriment", 3)
 
 // Flour + egg = dough
 /obj/item/weapon/reagent_containers/food/snacks/flour/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/research/designs/autolathe_designs.dm

@@ -163,7 +163,7 @@
 	category = list("initial", "Miscellaneous")
 	
 /datum/design/prox_sensor
-	name = "Proximity sensor"
+	name = "Proximity Sensor"
 	id = "prox_sensor"
 	build_type = AUTOLATHE
 	materials = list("$metal" = 800, "$glass" = 200)
@@ -187,7 +187,7 @@
 	category = list("initial", "Miscellaneous")	
 	
 /datum/design/voice_analyser
-	name = "Voice analyser"
+	name = "Voice Analyser"
 	id = "voice_analyser"
 	build_type = AUTOLATHE
 	materials = list("$metal" = 500, "$glass" = 50)

code/modules/research/designs/machine_designs.dm

@@ -60,7 +60,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/bodyscanner
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 
 /datum/design/sleep_console
 	name = "Machine Board (Body Scanner Console)"
@@ -70,7 +70,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/bodyscanner_console
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 	
 /datum/design/clonepod
 	name = "Machine Board (Cloning Pod)"
@@ -80,7 +80,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/clonepod
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 		
 /datum/design/clonescanner
 	name = "Machine Board (Cloning Scanner)"
@@ -90,7 +90,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/clonescanner
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 	
 /datum/design/cryotube
 	name = "Machine Board (Cryotube Board)"
@@ -100,7 +100,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/cryo_tube
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 	
 /datum/design/chem_dispenser
 	name = "Machine Board (Portable Chem Dispenser)"
@@ -110,7 +110,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/chem_dispenser
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 	
 /datum/design/sleeper
 	name = "Machine Board (Sleeper)"
@@ -120,7 +120,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/sleeper
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 
 /datum/design/sleep_console
 	name = "Machine Board (Sleeper Console)"
@@ -130,7 +130,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/sleep_console
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
 	
 /datum/design/biogenerator
 	name = "Machine Board (Biogenerator)"
@@ -240,7 +240,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/arcade/battle
-	category = list ("Misc. Machinery")
+	category = list("Misc. Machinery")
 
 /datum/design/microwave
 	name = "Machine Board (Microwave)"
@@ -250,7 +250,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/microwave
-	category = list ("Misc. Machinery")			
+	category = list("Misc. Machinery")			
 	
 /datum/design/orion_trail
 	name = "Machine Board (Orion Trail Arcade Machine)"
@@ -260,7 +260,7 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/arcade/orion_trail
-	category = list ("Misc. Machinery")
+	category = list("Misc. Machinery")
 
 /datum/design/vendor
 	name = "Machine Board (Vendor)"
@@ -270,4 +270,4 @@
 	build_type = IMPRINTER
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/vendor
-	category = list ("Misc. Machinery")
+	category = list("Misc. Machinery")

code/modules/research/designs/power_designs.dm

@@ -7,7 +7,7 @@
 	desc = "A basic power cell that holds 1000 units of energy"
 	id = "basic_cell"
 	req_tech = list("powerstorage" = 1)
-	build_type = PROTOLATHE | AUTOLATHE |MECHFAB
+	build_type = PROTOLATHE | AUTOLATHE | MECHFAB
 	materials = list("$metal" = 700, "$glass" = 50)
 	build_path = /obj/item/weapon/cell
 	category = list("Misc","Power")

code/modules/shuttles/antagonist.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/shuttle_control/multi/vox
 	name = "skipjack control console"
-	req_access = list(access_syndicate)
+	req_access = list(access_vox)
 	shuttle_tag = "Vox Skipjack"
 	
 /obj/machinery/computer/shuttle_control/multi/vox/attack_ai(user as mob)

code/modules/shuttles/shuttles_multi.dm

@@ -3,6 +3,7 @@
 
 	var/cloaked = 1
 	var/at_origin = 1
+	var/returned_home = 0
 	var/move_time = 240
 	var/cooldown = 20
 	var/last_move = 0	//the time at which we last moved
@@ -21,9 +22,11 @@
 	..()
 	if(origin) last_departed = origin
 
-/datum/shuttle/multi_shuttle/move()
+/datum/shuttle/multi_shuttle/move(var/area/origin, var/area/destination)
 	..()
 	last_move = world.time
+	if (destination == src.origin)
+		returned_home = 1
 
 /datum/shuttle/multi_shuttle/proc/announce_departure()