Merge branch 'BEF-staging'

baystation12.dme

@@ -52,6 +52,7 @@
 #define FILE_DIR "sound/violin"
 #define FILE_DIR "sound/voice"
 #define FILE_DIR "sound/voice/Serithi"
+#define FILE_DIR "sound/vox"
 #define FILE_DIR "sound/weapons"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
@@ -256,8 +257,6 @@
 #include "code\game\gamemodes\nuclear\pinpointer.dm"
 #include "code\game\gamemodes\revolution\revolution.dm"
 #include "code\game\gamemodes\revolution\rp_revolution.dm"
-#include "code\game\gamemodes\sandbox\h_sandbox.dm"
-#include "code\game\gamemodes\sandbox\sandbox.dm"
 #include "code\game\gamemodes\traitor\traitor.dm"
 #include "code\game\gamemodes\wizard\rightandwrong.dm"
 #include "code\game\gamemodes\wizard\soulstone.dm"
@@ -387,6 +386,7 @@
 #include "code\game\machinery\doors\checkForMultipleDoors.dm"
 #include "code\game\machinery\doors\door.dm"
 #include "code\game\machinery\doors\firedoor.dm"
+#include "code\game\machinery\doors\multi_tile.dm"
 #include "code\game\machinery\doors\poddoor.dm"
 #include "code\game\machinery\doors\shutters.dm"
 #include "code\game\machinery\doors\unpowered.dm"
@@ -585,6 +585,7 @@
 #include "code\game\objects\items\weapons\tanks\jetpack.dm"
 #include "code\game\objects\items\weapons\tanks\tank_types.dm"
 #include "code\game\objects\items\weapons\tanks\tanks.dm"
+#include "code\game\objects\random\random.dm"
 #include "code\game\objects\storage\coat.dm"
 #include "code\game\objects\structures\barsign.dm"
 #include "code\game\objects\structures\bedsheet_bin.dm"
@@ -709,6 +710,7 @@
 #include "code\modules\admin\verbs\striketeam_syndicate.dm"
 #include "code\modules\admin\verbs\ticklag.dm"
 #include "code\modules\admin\verbs\tripAI.dm"
+#include "code\modules\admin\verbs\vox_raiders.dm"
 #include "code\modules\assembly\assembly.dm"
 #include "code\modules\assembly\bomb.dm"
 #include "code\modules\assembly\helpers.dm"
@@ -983,6 +985,7 @@
 #include "code\modules\mob\living\silicon\pai\recruit.dm"
 #include "code\modules\mob\living\silicon\pai\say.dm"
 #include "code\modules\mob\living\silicon\pai\software.dm"
+#include "code\modules\mob\living\silicon\robot\component.dm"
 #include "code\modules\mob\living\silicon\robot\death.dm"
 #include "code\modules\mob\living\silicon\robot\emote.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
@@ -992,6 +995,7 @@
 #include "code\modules\mob\living\silicon\robot\life.dm"
 #include "code\modules\mob\living\silicon\robot\login.dm"
 #include "code\modules\mob\living\silicon\robot\robot.dm"
+#include "code\modules\mob\living\silicon\robot\robot_damage.dm"
 #include "code\modules\mob\living\silicon\robot\robot_items.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules.dm"
 #include "code\modules\mob\living\silicon\robot\robot_movement.dm"
@@ -1002,6 +1006,7 @@
 #include "code\modules\mob\living\simple_animal\parrot.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"
+#include "code\modules\mob\living\simple_animal\vox.dm"
 #include "code\modules\mob\living\simple_animal\worm.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
@@ -1102,7 +1107,9 @@
 #include "code\modules\projectiles\guns\energy\stun.dm"
 #include "code\modules\projectiles\guns\energy\temperature.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
+#include "code\modules\projectiles\guns\projectile\bow.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
+#include "code\modules\projectiles\guns\projectile\pneumatic.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
 #include "code\modules\projectiles\guns\projectile\shotgun.dm"
 #include "code\modules\projectiles\projectile\animate.dm"
@@ -1119,6 +1126,7 @@
 #include "code\modules\reagents\Chemistry-Reagents-Antidepressants.dm"
 #include "code\modules\reagents\Chemistry-Reagents.dm"
 #include "code\modules\reagents\Chemistry-Recipes.dm"
+#include "code\modules\reagents\dartgun.dm"
 #include "code\modules\reagents\grenade_launcher.dm"
 #include "code\modules\reagents\reagent_containers.dm"
 #include "code\modules\reagents\reagent_dispenser.dm"
@@ -1257,6 +1265,7 @@
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\periodic_news.dm"
+#include "code\WorkInProgress\Apples\artifacts.dm"
 #include "code\WorkInProgress\Cael_Aislinn\meteor_battery.dm"
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Accounts.dm"
@@ -1302,6 +1311,7 @@
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"
 #include "code\WorkInProgress\Chinsky\ashtray.dm"
 #include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
+#include "code\WorkInProgress\kilakk\responseteam.dm"
 #include "code\WorkInProgress\Mini\ATM.dm"
 #include "code\WorkInProgress\Mini\atmos_control.dm"
 #include "code\WorkInProgress\Ported\policetape.dm"

code/WorkInProgress/Apples/artifacts.dm

@@ -14,7 +14,6 @@ obj/item/changestone/attack_hand(var/mob/user as mob)
 				H.gender = FEMALE
 			H.dna.ready_dna(H)
 			H.update_body()
-			H.update_face()
 	..()
 
 

code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm

@@ -27,7 +27,7 @@ var/global/datum/money_account/vendor_account
 
 		//add the account
 		station_account.transaction_log.Add(T)
-		for(var/obj/machinery/account_database/A in world)
+		for(var/obj/machinery/account_database/A in machines)
 			A.accounts.Add(station_account)
 
 /proc/create_department_account(department)
@@ -50,7 +50,7 @@ var/global/datum/money_account/vendor_account
 
 	//add the account
 	department_account.transaction_log.Add(T)
-	for(var/obj/machinery/account_database/A in world)
+	for(var/obj/machinery/account_database/A in machines)
 		A.accounts.Add(department_account)
 
 	department_accounts[department] = department_account
@@ -194,7 +194,7 @@ var/global/datum/money_account/vendor_account
 	if(href_list["choice"])
 		switch(href_list["choice"])
 			if("sync_accounts")
-				for(var/obj/machinery/account_database/A in world)
+				for(var/obj/machinery/account_database/A in machines)
 					for(var/datum/money_account/M in src.accounts)
 						if(!A.accounts.Find(M))
 							A.accounts.Add(M)
@@ -257,7 +257,7 @@ var/global/datum/money_account/vendor_account
 
 /obj/machinery/account_database/proc/add_account_across_all(var/new_owner_name = "Default user", var/starting_funds = 0, var/pre_existing = 0)
 	var/datum/money_account/M = add_account(new_owner_name, starting_funds, pre_existing)
-	for(var/obj/machinery/account_database/D in world)
+	for(var/obj/machinery/account_database/D in machines)
 		if(D == src)
 			continue
 		D.accounts.Add(M)

code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm

@@ -46,7 +46,7 @@
 	D.name = "small parcel - 'EFTPOS access code'"
 
 /obj/item/device/eftpos/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/account_database/DB in machines)
 		if(DB.z == src.z)
 			linked_db = DB
 			break

code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm

@@ -35,7 +35,7 @@
 	New()
 		//pick a random temple to link to
 		var/list/waypoints = list()
-		for(var/obj/effect/landmark/temple/destination/T in world)
+		for(var/obj/effect/landmark/temple/destination/T in landmarks_list)
 			waypoints.Add(T)
 			if(!T)
 				return
@@ -163,7 +163,7 @@
 		num_spawned++
 
 	//make some randomly pathing rivers
-	for(var/obj/effect/landmark/river_waypoint/W in world)
+	for(var/obj/effect/landmark/river_waypoint/W in landmarks_list)
 		if (W.z != src.z || W.connected)
 			continue
 
@@ -236,7 +236,7 @@
 		num_spawned++
 
 	//get any path nodes placed on the map
-	for(var/obj/effect/landmark/path_waypoint/W in world)
+	for(var/obj/effect/landmark/path_waypoint/W in landmarks_list)
 		if (W.z == src.z)
 			path_nodes.Add(W)
 

code/WorkInProgress/Mini/ATM.dm

@@ -67,7 +67,7 @@ log transactions
 		break
 
 /obj/machinery/atm/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/account_database/DB in machines)
 		if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated )
 			linked_db = DB
 			break

code/WorkInProgress/Mini/atmos_control.dm

@@ -35,7 +35,7 @@
 	if(current)
 		dat += specific()
 	else
-		for(var/obj/machinery/alarm/alarm in world)
+		for(var/obj/machinery/alarm/alarm in machines)
 			dat += "<a href='?src=\ref[src]&alarm=\ref[alarm]'>"
 			switch(max(alarm.danger_level, alarm.alarm_area.atmosalm))
 				if (0)
@@ -141,7 +141,10 @@
 
 					//Sets the temperature the built-in heater/cooler tries to maintain.
 					if(env == "temperature")
-						current.target_temperature = (selected[2] + selected[3])/2
+						if(current.target_temperature < selected[2])
+							current.target_temperature = selected[2]
+						if(current.target_temperature > selected[3])
+							current.target_temperature = selected[3]
 
 					spawn(1)
 						updateUsrDialog()

code/WorkInProgress/kilakk/responseteam.dm

@@ -49,7 +49,7 @@ var/sent_emergency_team = 0
 	// Shamelessly stolen nuke code
 	var/nuke_code
 	var/temp_code
-	for(var/obj/machinery/nuclearbomb/N in world)
+	for(var/obj/machinery/nuclearbomb/N in machines)
 		temp_code = text2num(N.r_code)
 		if(temp_code)
 			nuke_code = N.r_code
@@ -94,11 +94,11 @@ var/sent_emergency_team = 0
 
 	command_alert("Sensors indicate that [station_name()] has entered Code Red and is in need of assistance. We will prepare and dispatch an emergency response team to deal with the situation.", "NMV Icarus Command")
 
-	for(var/obj/effect/landmark/L in world)
+	for(var/obj/effect/landmark/L in landmarks_list)
 		if(L.name == "Response Team")
 			leader_selected = member_number == 1?1:0 // The last person selected will be the leader
 
-			var/mob/living/carbon/human/new_member = create_response_team(L, leader_selected)
+			var/mob/living/carbon/human/new_member = spawn_response_team(L, leader_selected)
 
 			new_member.age = !leader_selected ? rand(23,35) : rand(35,45)
 
@@ -188,7 +188,7 @@ var/sent_emergency_team = 0
 	return 1
 
 // Mob creation
-/client/proc/create_response_team(obj/spawn_location, leader_selected = 0)
+/client/proc/spawn_response_team(obj/spawn_location, leader_selected = 0)
 	var/mob/living/carbon/human/new_member = new(spawn_location.loc)
 
 	return new_member

code/ZAS/Connection.dm

@@ -75,21 +75,31 @@ connection
 			var/list/connections = air_master.turfs_with_connections[ref_A]
 			connections.Remove(src)
 
-		//Ensure we delete the right values by sanity checkign right before deletion.
-		Sanitize()
-
-		//Remove connection from current zones.
+		//Remove connection from zones.
 		if(A)
 			if(A.zone && A.zone.connections)
 				A.zone.connections.Remove(src)
 				if(!A.zone.connections.len)
 					A.zone.connections = null
+
+		if(istype(zone_A) && (!A || A.zone != zone_A))
+			if(zone_A.connections)
+				zone_A.connections.Remove(src)
+				if(!zone_A.connections.len)
+					zone_A.connections = null
+
 		if(B)
 			if(B.zone && B.zone.connections)
 				B.zone.connections.Remove(src)
 				if(!B.zone.connections.len)
 					B.zone.connections = null
 
+		if(istype(zone_B) && (!B || B.zone != zone_B))
+			if(zone_B.connections)
+				zone_B.connections.Remove(src)
+				if(!zone_B.connections.len)
+					zone_B.connections = null
+
 		//Disconnect zones while handling unusual conditions.
 		//	e.g. loss of a zone on a turf
 		if(A && A.zone && B && B.zone)

code/ZAS/Fire.dm

@@ -20,20 +20,19 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
 
 
 turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
-	if(fire_protection > world.time-300) return
+	if(fire_protection > world.time-300)
+		return 0
+	if(locate(/obj/fire) in src)
+		return 1
 	var/datum/gas_mixture/air_contents = return_air()
 	if(!air_contents || exposed_temperature < PLASMA_MINIMUM_BURN_TEMPERATURE)
 		return 0
 
 	var/igniting = 0
-	if(locate(/obj/fire) in src)
-		return 1
-	var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
 	var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in src
-	if(air_contents.calculate_firelevel(liquid) > vsc.IgnitionLevel && (fuel || liquid || air_contents.toxins > 0.5))
+	
+	if(air_contents.check_combustability(liquid))
 		igniting = 1
-		if(air_contents.oxygen < 0.5)
-			return 0
 
 		if(! (locate(/obj/fire) in src))
 
@@ -63,89 +62,93 @@ obj
 
 		process()
 			. = 1
-
-			if(firelevel > vsc.IgnitionLevel)
-
-				var/turf/simulated/floor/S = loc
-				if(!S.zone) del src //Cannot exist where zones are broken.
-
-				if(istype(S))
-					var
-						datum/gas_mixture/air_contents = S.return_air()
-						//Get whatever trace fuels are in the area
-						datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
-						//Also get liquid fuels on the ground.
-						obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in S
-
-					var/datum/gas_mixture/flow = air_contents.remove_ratio(vsc.fire_consuption_rate)
-					//The reason we're taking a part of the air instead of all of it is so that it doesn't jump to
-					//the fire's max temperature instantaneously.
-
-					firelevel = air_contents.calculate_firelevel(liquid)
-
-					//Ensure that there is an appropriate amount of fuel and O2 here.
-					if(firelevel > 0.25 && flow.oxygen > 0.3 && (air_contents.toxins || fuel || liquid))
-
-						for(var/direction in cardinal)
-							if(S.air_check_directions&direction) //Grab all valid bordering tiles
-
-								var/turf/simulated/enemy_tile = get_step(S, direction)
-
-								if(istype(enemy_tile))
-									//If extinguisher mist passed over the turf it's trying to spread to, don't spread and
-									//reduce firelevel.
-									if(enemy_tile.fire_protection > world.time-30)
-										firelevel -= 1.5
-										continue
-
-									//Spread the fire.
-									if(!(locate(/obj/fire) in enemy_tile))
-										if( prob( firelevel*10 ) && S.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, S, 0,0))
-											new/obj/fire(enemy_tile,firelevel)
-
-					if(flow)
-
-						//Ensure adequate oxygen and fuel.
-						if(flow.oxygen > 0.3 && (flow.toxins || fuel || liquid))
-
-							//Change icon depending on the fuel, and thus temperature.
-							if(firelevel > 6)
-								icon_state = "3"
-								SetLuminosity(7)
-							else if(firelevel > 2.5)
-								icon_state = "2"
-								SetLuminosity(5)
-							else
-								icon_state = "1"
-								SetLuminosity(3)
-
-							//Ensure flow temperature is higher than minimum fire temperatures.
-							flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature)
-
-							//Burn the gas mixture.
-							flow.zburn(liquid)
-							if(fuel && fuel.moles <= 0.00001)
-								air_contents.trace_gases.Remove(fuel)
-
-						else
-
-							del src
-
-
-						S.assume_air(flow) //Then put it back where you found it.
-
-					else
-						del src
-				else
-					del src
-			else
+			
+			//get location and check if it is in a proper ZAS zone
+			var/turf/simulated/floor/S = loc
+			if(!S.zone)
 				del src
-
-
+			
+			if(!istype(S))
+				del src
+				
+			var/datum/gas_mixture/air_contents = S.return_air()
+			//get liquid fuels on the ground.
+			var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in S
+			//and the volatile stuff from the air
+			var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
+			
+			//since the air is processed in fractions, we need to make sure not to have any minuscle residue or
+			//the amount of moles might get to low for some functions to catch them and thus result in wonky behaviour
+			if(air_contents.oxygen < 0.001)
+				air_contents.oxygen = 0
+			if(air_contents.toxins < 0.001)
+				air_contents.toxins = 0
+			if(fuel)
+				if(fuel.moles < 0.001)
+					air_contents.trace_gases.Remove(fuel)
+			
+			//check if there is something to combust
+			if(!air_contents.check_combustability(liquid))
+				del src
+			
+			//get a firelevel and set the icon
+			firelevel = air_contents.calculate_firelevel(liquid)
+			
+			if(firelevel > 6)
+				icon_state = "3"
+				SetLuminosity(7)
+			else if(firelevel > 2.5)
+				icon_state = "2"
+				SetLuminosity(5)
+			else
+				icon_state = "1"
+				SetLuminosity(3)
+				
+			//im not sure how to implement a version that works for every creature so for now monkeys are firesafe
 			for(var/mob/living/carbon/human/M in loc)
-				M.FireBurn(firelevel) //Burn the humans!
+				M.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans!
 
+			
+			//spread!
+			for(var/direction in cardinal)
+				if(S.air_check_directions&direction) //Grab all valid bordering tiles
 
+					var/turf/simulated/enemy_tile = get_step(S, direction)
+
+					if(istype(enemy_tile))
+						//If extinguisher mist passed over the turf it's trying to spread to, don't spread and
+						//reduce firelevel.
+						if(enemy_tile.fire_protection > world.time-30)
+							firelevel -= 1.5
+							continue
+
+						//Spread the fire.
+						if(!(locate(/obj/fire) in enemy_tile))
+							if( prob( 50 + 50 * (firelevel/vsc.fire_firelevel_multiplier) ) && S.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, S, 0,0))
+								new/obj/fire(enemy_tile,firelevel)
+			
+			//seperate part of the present gas
+			//this is done to prevent the fire burning all gases in a single pass
+			var/datum/gas_mixture/flow = air_contents.remove_ratio(vsc.fire_consuption_rate)
+			
+///////////////////////////////// FLOW HAS BEEN CREATED /// DONT DELETE THE FIRE UNTIL IT IS MERGED BACK OR YOU WILL DELETE AIR ///////////////////////////////////////////////
+			
+			if(flow)
+				if(flow.check_combustability(liquid))
+					//Ensure flow temperature is higher than minimum fire temperatures.
+						//this creates some energy ex nihilo but is necessary to get a fire started
+						//lets just pretend this energy comes from the ignition source and dont mention this again
+					//flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature)
+					
+					//burn baby burn!
+					flow.zburn(liquid,1)
+				
+				//merge the air back
+				S.assume_air(flow)
+
+///////////////////////////////// FLOW HAS BEEN REMERGED /// feel free to delete the fire again from here on //////////////////////////////////////////////////////////////////
+
+					
 		New(newLoc,fl)
 			..()
 
@@ -175,14 +178,15 @@ turf/simulated/apply_fire_protection()
 	fire_protection = world.time
 
 
-datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid)
-	//This proc is similar to fire(), but uses a simple logarithm to calculate temp, and is thus more stable with ZAS.
-	if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE)
-		var
-			total_fuel = toxins
-
-			datum/gas/volatile_fuel/fuel = locate() in trace_gases
+datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid,force_burn)
+	var/value = 0
+	
+	if((temperature > PLASMA_MINIMUM_BURN_TEMPERATURE || force_burn) && check_combustability(liquid) )
+		var/total_fuel = 0 
+		var/datum/gas/volatile_fuel/fuel = locate() in trace_gases
 
+		total_fuel += toxins
+		
 		if(fuel)
 		//Volatile Fuel
 			total_fuel += fuel.moles
@@ -192,65 +196,93 @@ datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid)
 			if(liquid.amount <= 0)
 				del liquid
 			else
-				total_fuel += liquid.amount*15
+				total_fuel += liquid.amount
 
-		if(! (fuel || toxins || liquid) )
-			return 0 //If there's no fuel, there's no burn. Can't divide by zero anyway.
+		//Calculate the firelevel.
+		var/firelevel = calculate_firelevel(liquid)
 
-		if(oxygen > 0.3)
+		//get the current inner energy of the gas mix
+		//this must be taken here to prevent the addition or deletion of energy by a changing heat capacity
+		var/starting_energy = temperature * heat_capacity()
 
-				//Calculate the firelevel.
-			var/firelevel = calculate_firelevel(liquid)
+		//determine the amount of oxygen used
+		var/total_oxygen = min(oxygen, 2 * total_fuel)
+		
+		//determine the amount of fuel actually used
+		var/used_fuel_ratio = min(oxygen / 2 , total_fuel) / total_fuel
+		total_fuel = total_fuel * used_fuel_ratio
 
-				//Reaches a maximum practical temperature of around 4500.
+		var/total_reactants = total_fuel + total_oxygen
 
-			//Increase temperature.
-			temperature = max( vsc.fire_temperature_multiplier*log(0.04*firelevel + 1.24) , temperature )
+		//determine the amount of reactants actually reacting
+		var/used_reactants_ratio = min( max(total_reactants * firelevel / vsc.fire_firelevel_multiplier, 0.2), total_reactants) / total_reactants
 
-			var/total_reactants = min(oxygen, 2*total_fuel) + total_fuel
+		//remove and add gasses as calculated
+		oxygen -= min(oxygen, total_oxygen * used_reactants_ratio )
 
-			//Consume some gas.
-			var/consumed_gas = max( min( total_reactants, vsc.fire_gas_combustion_ratio*firelevel ), 0.2)
+		toxins -= min(toxins, toxins * used_fuel_ratio * used_reactants_ratio )
 
-			oxygen -= min(oxygen, (total_reactants-total_fuel)*consumed_gas/total_reactants )
+		carbon_dioxide += max(2 * total_fuel, 0)
 
-			toxins -= min(toxins, toxins*consumed_gas/total_reactants )
+		if(fuel)
+			fuel.moles -= fuel.moles * used_fuel_ratio * used_reactants_ratio
+			if(fuel.moles <= 0) del fuel
 
-			carbon_dioxide += max(consumed_gas, 0)
+		if(liquid)
+			liquid.amount -= liquid.amount * used_fuel_ratio * used_reactants_ratio
+			if(liquid.amount <= 0) del liquid
 
-			if(fuel)
-				fuel.moles -= fuel.moles*consumed_gas/total_reactants
-				if(fuel.moles <= 0) del fuel
+		//calculate the energy produced by the reaction and then set the new temperature of the mix
+		temperature = (starting_energy + vsc.fire_fuel_energy_release * total_fuel) / heat_capacity()
+		
+		update_values()
+		value = total_reactants * used_reactants_ratio
+	return value
 
-			if(liquid)
-				liquid.amount -= liquid.amount*consumed_gas/(total_reactants)
-				if(liquid.amount <= 0) del liquid
-
-			update_values()
-			return consumed_gas
-	return 0
+datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fuel/liquid)
+	//this check comes up very often and is thus centralized here to ease adding stuff
+	
+	var/datum/gas/volatile_fuel/fuel = locate() in trace_gases	
+	var/value = 0
+	
+	if(oxygen && (toxins || fuel || liquid))
+		value = 1
+	
+	return value
 
 datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fuel/liquid)
-		//Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
-	var
-		datum/gas/volatile_fuel/fuel = locate() in trace_gases
+	//Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
+	
+	var/datum/gas/volatile_fuel/fuel = locate() in trace_gases
+	var/total_fuel = 0
+	var/firelevel = 0
+	
+	if(check_combustability(liquid))
+	
+		total_fuel += toxins
 
-	var/total_fuel = toxins - 0.5
+		if(liquid)
+			total_fuel += liquid.amount
 
-	if(liquid)
-		total_fuel += (liquid.amount*15)
+		if(fuel)
+			total_fuel += fuel.moles
 
-	if(fuel)
-		total_fuel += fuel.moles
-
-	var/total_combustables = (total_fuel + oxygen)
-	if(total_fuel <= 0 || oxygen <= 0)
-		return 0
-
-	return max( 0, vsc.fire_firelevel_multiplier*(total_combustables/(total_combustables + nitrogen))*log(2*total_combustables/oxygen)*log(total_combustables/total_fuel))
+		var/total_combustables = (total_fuel + oxygen)
+		
+		if(total_fuel > 0 && oxygen > 0)
+			
+			//slows down the burning when the concentration of the reactants is low
+			var/dampening_multiplier = total_combustables / (total_combustables + nitrogen + carbon_dioxide)
+			//calculates how close the mixture of the reactants is to the optimum
+			var/mix_multiplier = 1 / (1 + (5 * ((oxygen / total_combustables) ^2)))
+			//toss everything together
+			firelevel = vsc.fire_firelevel_multiplier * mix_multiplier * dampening_multiplier
+			
+	return max( 0, firelevel)
 
 
-/mob/living/carbon/human/proc/FireBurn(var/firelevel)
+/mob/living/carbon/human/proc/FireBurn(var/firelevel, var/last_temperature, var/pressure)
+// mostly using the old proc from Sky until I can think of something better
 	//Burns mobs due to fire. Respects heat transfer coefficients on various body parts.
 	//Due to TG reworking how fireprotection works, this is kinda less meaningful.
 
@@ -261,8 +293,9 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue
 		legs_exposure = 1
 		arms_exposure = 1
 
-	var/mx = min(max(0.1,firelevel / 20),10)
-	var/last_temperature = vsc.fire_temperature_multiplier*log(0.04*firelevel + 1.24)
+	//determine the multiplier
+	//minimize this for low-pressure enviroments
+	var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
 
 	//Get heat transfer coefficients for clothing.
 	//skytodo: kill anyone who breaks things then orders me to fix them
@@ -293,4 +326,3 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue
 	apply_damage(0.4*mx*arms_exposure, BURN, "r_arm", 0, 0, "Fire")
 
 	//flash_pain()
-#undef ZAS_FIRE_CONSUMPTION_RATE

code/ZAS/Variable Settings.dm

@@ -1,25 +1,18 @@
 var/global/vs_control/vsc = new
 
 vs_control/var
-	IgnitionLevel = 0.5
-	IgnitionLevel_DESC = "Determines point at which fire can ignite"
-
 	fire_consuption_rate = 0.25
 	fire_consuption_rate_NAME = "Fire - Air Consumption Ratio"
 	fire_consuption_rate_DESC = "Ratio of air removed and combusted per tick."
 
 	fire_firelevel_multiplier = 25
 	fire_firelevel_multiplier_NAME = "Fire - Firelevel Constant"
-	fire_firelevel_multiplier_DESC = "Multiplied by the equation for firelevel, affects the combustion and ignition of gas mixes."
-
-	fire_temperature_multiplier = 1700
-	fire_temperature_multiplier_NAME = "Fire - Temperature Multiplier"
-	fire_temperature_multiplier_DESC = "Base value for fire temperatures."
-
-	fire_gas_combustion_ratio = 0.25
-	fire_gas_combustion_ratio_NAME = "Fire - Gas Conversion Ratio"
-	fire_gas_combustion_ratio_DESC = "The rate at which oxygen and plasma are converted to CO2, expressed in terms of the firelevel."
+	fire_firelevel_multiplier_DESC = "Multiplied by the equation for firelevel, affects mainly the extingiushing of fires."
 
+	fire_fuel_energy_release = 397000
+	fire_fuel_energy_release_NAME = "Fire - Fuel energy release"
+	fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance"
+	
 
 	airflow_lightest_pressure = 20
 	airflow_lightest_pressure_NAME = "Airflow - Small Movement Threshold %"
@@ -229,7 +222,6 @@ vs_control
 				plc.CONTAMINATION_LOSS = 0.075
 
 			if("ZAS - Normal")
-				IgnitionLevel = 0.5
 				airflow_lightest_pressure = 20
 				airflow_light_pressure = 35
 				airflow_medium_pressure = 50
@@ -244,7 +236,6 @@ vs_control
 				airflow_mob_slowdown = 1
 
 			if("ZAS - Forgiving")
-				IgnitionLevel = 1
 				airflow_lightest_pressure = 45
 				airflow_light_pressure = 60
 				airflow_medium_pressure = 120
@@ -259,7 +250,6 @@ vs_control
 				airflow_mob_slowdown = 0
 
 			if("ZAS - Dangerous")
-				IgnitionLevel = 0.4
 				airflow_lightest_pressure = 15
 				airflow_light_pressure = 30
 				airflow_medium_pressure = 45
@@ -274,7 +264,6 @@ vs_control
 				airflow_mob_slowdown = 2
 
 			if("ZAS - Hellish")
-				IgnitionLevel = 0.3
 				airflow_lightest_pressure = 20
 				airflow_light_pressure = 30
 				airflow_medium_pressure = 40
@@ -330,4 +319,4 @@ pl_control
 					newvalue = roll(txt)
 			else
 				newvalue = vars[V]
-			vars[V] = newvalue
+			vars[V] = newvalue

code/ZAS/ZAS_Zones.dm

@@ -385,7 +385,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output)
 		// slowly than small rooms, preserving our good old "hollywood-style"
 		// oh-shit effect when large rooms get breached, but still having small
 		// rooms remain pressurized for long enough to make escape possible.
-		share_size = max(1, max(size - 5, 1) + unsimulated_tiles.len)
+		share_size = max(1, max(size + 3, 1) + unsimulated_tiles.len)
 		correction_ratio = share_size / unsimulated_tiles.len
 
 	for(var/turf/T in unsimulated_tiles)

code/__HELPERS/unsorted.dm

@@ -1198,7 +1198,7 @@ proc/oview_or_orange(distance = world.view , center = usr , type)
 
 proc/get_mob_with_client_list()
 	var/list/mobs = list()
-	for(var/mob/M in world)
+	for(var/mob/M in mob_list)
 		if (M.client)
 			mobs += M
 	return mobs

code/controllers/configuration.dm

@@ -34,12 +34,13 @@
 	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
-	var/continous_rounds = 0			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
+	var/continous_rounds = 1			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
 	var/allow_Metadata = 0				// Metadata is supported.
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
 	var/Tickcomp = 0
 	var/socket_talk	= 0					// use socket_talk to communicate with other processes
+	var/list/resource_urls = null
 
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
@@ -168,6 +169,9 @@
 
 		if(type == "config")
 			switch (name)
+				if ("resource_urls")
+					config.resource_urls = stringsplit(value, " ")
+
 				if ("admin_legacy_system")
 					config.admin_legacy_system = 1
 

code/controllers/master_controller.dm

@@ -84,12 +84,12 @@ datum/controller/game_controller/proc/setup_objects()
 
 	world << "\red \b Initializing pipe networks"
 	sleep(-1)
-	for(var/obj/machinery/atmospherics/machine in world)
+	for(var/obj/machinery/atmospherics/machine in machines)
 		machine.build_network()
 
 	world << "\red \b Initializing atmos machinery."
 	sleep(-1)
-	for(var/obj/machinery/atmospherics/unary/U in world)
+	for(var/obj/machinery/atmospherics/unary/U in machines)
 		if(istype(U, /obj/machinery/atmospherics/unary/vent_pump))
 			var/obj/machinery/atmospherics/unary/vent_pump/T = U
 			T.broadcast_status()

code/controllers/shuttle_controller.dm

@@ -67,6 +67,7 @@ datum/shuttle_controller
 				captain_announce("The shuttle has been recalled.")
 				setdirection(-1)
 				online = 1
+				alert = 0 // set alert back to 0 after an admin recall
 				return
 
 	// returns the time (in seconds) before shuttle arrival
@@ -130,7 +131,7 @@ datum/shuttle_controller
 
 							start_location.move_contents_to(end_location, null, NORTH)
 
-							for(var/obj/machinery/door/unpowered/D in world)
+							for(var/obj/machinery/door/unpowered/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.locked = 0
@@ -152,7 +153,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod1/centcom)
 							start_location.move_contents_to(end_location, null, NORTH)
 
-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -172,7 +173,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod2/centcom)
 							start_location.move_contents_to(end_location, null, NORTH)
 
-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -192,7 +193,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod3/centcom)
 							start_location.move_contents_to(end_location, null, NORTH)
 
-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -212,7 +213,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod5/centcom)
 							start_location.move_contents_to(end_location, null, EAST)
 
-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()

code/controllers/voting.dm

@@ -1,5 +1,7 @@
 var/datum/controller/vote/vote = new()
 
+var/global/list/round_voters = list() //Keeps track of the individuals voting for a given round, for use in forcedrafting.
+
 datum/controller/vote
 	var/initiator = null
 	var/started_time = null
@@ -10,6 +12,7 @@ datum/controller/vote
 	var/list/voted = list()
 	var/list/voting = list()
 	var/list/current_votes = list()
+	var/auto_muted = 0
 
 	New()
 		if(vote != src)
@@ -53,6 +56,14 @@ datum/controller/vote
 		voting.Cut()
 		current_votes.Cut()
 
+		if(auto_muted && !ooc_allowed)
+			auto_muted = 0
+			ooc_allowed = !( ooc_allowed )
+			world << "<b>The OOC channel has been automatically enabled due to vote cancellation.</b>"
+			log_admin("OOC was toggled automatically due to vote cancellation.")
+			message_admins("OOC has been toggled on automatically.")
+
+
 	proc/get_result()
 		//get the highest number of votes
 		var/greatest_votes = 0
@@ -110,6 +121,11 @@ datum/controller/vote
 				for(var/option in winners)
 					text += "\t[option]\n"
 			. = pick(winners)
+
+			for(var/key in current_votes)
+				if(choices[current_votes[key]] == .)
+					round_voters += key // Keep track of who voted for the winning round.
+
 			text += "<b>Vote Result: [.]</b>"
 		else
 			text += "<b>Vote Result: Inconclusive - No Votes!</b>"
@@ -138,6 +154,12 @@ datum/controller/vote
 				if("crew_transfer")
 					if(. == "Initiate Crew Transfer")
 						init_shift_change(null, 1)
+					if(auto_muted && !ooc_allowed)
+						auto_muted = 0
+						ooc_allowed = !( ooc_allowed )
+						world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
+						log_admin("OOC was toggled automatically due to vote end.")
+						message_admins("OOC has been toggled on automatically.")
 
 
 		if(restart)
@@ -202,14 +224,35 @@ datum/controller/vote
 			world << "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>"
 			switch(vote_type)
 				if("crew_transfer")
-					world << sound('sound/voice/Serithi/Shuttlehere.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 				if("gamemode")
-					world << sound('sound/voice/Serithi/pretenddemoc.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 				if("custom")
-					world << sound('sound/voice/Serithi/weneedvote.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 			if(mode == "gamemode" && going)
 				going = 0
 				world << "<font color='red'><b>Round start has been delayed.</b></font>"
+			if(mode == "crew_transfer" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the crew transfer vote.</b>"
+				log_admin("OOC was toggled automatically due to crew_transfer vote.")
+				message_admins("OOC has been toggled off automatically.")
+			if(mode == "gamemode" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the gamemode vote.</b>"
+				log_admin("OOC was toggled automatically due to gamemode vote.")
+				message_admins("OOC has been toggled off automatically.")
+			if(mode == "custom" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the custom vote.</b>"
+				log_admin("OOC was toggled automatically due to custom vote.")
+				message_admins("OOC has been toggled off automatically.")
+
+
+
 
 			time_remaining = round(config.vote_period/10)
 			return 1
@@ -234,9 +277,9 @@ datum/controller/vote
 				var/votes = choices[choices[i]]
 				if(!votes)	votes = 0
 				if(current_votes[C.ckey] == i)
-					. += "<li><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a> ([votes] votes)</b></li>"
+					. += "<li><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></li>"
 				else
-					. += "<li><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a> ([votes] votes)</li>"
+					. += "<li><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></li>"
 
 			. += "</ul><hr>"
 			if(admin)

code/datums/datacore.dm

@@ -7,8 +7,9 @@
 			manifest_inject(H)
 		return
 
-/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment, var/alt_title = null)
+/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment)
 	var/datum/data/record/foundrecord
+	var/real_title = assignment
 
 	for(var/datum/data/record/t in data_core.general)
 		if (t)
@@ -16,14 +17,18 @@
 				foundrecord = t
 				break
 
+	var/list/all_jobs = get_job_datums()
+
+	for(var/datum/job/J in all_jobs)
+		var/list/alttitles = get_alternate_titles(J.title)
+		if(!J)	continue
+		if(assignment in alttitles)
+			real_title = J.title
+			break
+
 	if(foundrecord)
 		foundrecord.fields["rank"] = assignment
-		if(alt_title)
-			foundrecord.fields["real_rank"] = alt_title
-		else
-			foundrecord.fields["real_rank"] = assignment
-
-
+		foundrecord.fields["real_rank"] = real_title
 
 /obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
 	if(H.mind && (H.mind.assigned_role != "MODE"))
@@ -122,9 +127,10 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 			icobase = 'icons/mob/human_races/r_lizard.dmi'
 		if("Skrell")
 			icobase = 'icons/mob/human_races/r_skrell.dmi'
-
 		if("Vox")
 			icobase = 'icons/mob/human_races/r_vox.dmi'
+		if("Kidan")
+			icobase = 'icons/mob/human_races/r_kidan.dmi'
 
 		else
 			icobase = 'icons/mob/human_races/r_human.dmi'

code/datums/datumvars.dm

@@ -730,7 +730,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon/human"
 			return
 
-		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","slime","plant","shadow","tajaran","skrell","vox")
+		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","slime","plant","shadow","tajaran","skrell","vox","kidan")
 		switch(new_mutantrace)
 			if(null)
 				return

code/datums/mind.dm

@@ -217,7 +217,7 @@ datum/mind
 				text += "<b>OPERATIVE</b>|<a href='?src=\ref[src];nuclear=clear'>nanotrasen</a>"
 				text += "<br><a href='?src=\ref[src];nuclear=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];nuclear=dressup'>dress up</a>."
 				var/code
-				for (var/obj/machinery/nuclearbomb/bombue in world)
+				for (var/obj/machinery/nuclearbomb/bombue in machines)
 					if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 						code = bombue.r_code
 						break
@@ -719,7 +719,7 @@ datum/mind
 						usr << "\red Equipping a syndicate failed!"
 				if("tellcode")
 					var/code
-					for (var/obj/machinery/nuclearbomb/bombue in world)
+					for (var/obj/machinery/nuclearbomb/bombue in machines)
 						if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 							code = bombue.r_code
 							break
@@ -1220,5 +1220,9 @@ datum/mind
 	mind.assigned_role = "Juggernaut"
 	mind.special_role = "Cultist"
 
+/mob/living/simple_animal/vox/armalis/mind_initialize()
+	..()
+	mind.assigned_role = "Armalis"
+	mind.special_role = "Vox Raider"
 
 

code/datums/supplypacks.dm

@@ -66,6 +66,29 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Monkey crate"
 	group = "Hydroponics"
 
+/datum/supply_packs/farwa
+	name = "Farwa crate"
+	contains = list (/obj/item/weapon/storage/box/farwacubes)
+	cost = 30
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Farwa crate"
+	group = "Hydroponics"
+
+/datum/supply_packs/skrell
+	name = "Neaera crate"
+	contains = list (/obj/item/weapon/storage/box/neaeracubes)
+	cost = 30
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Neaera crate"
+	group = "Hydroponics"
+
+/datum/supply_packs/stok
+	name = "Stok crate"
+	contains = list (/obj/item/weapon/storage/box/stokcubes)
+	cost = 30
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Stok crate"
+	group = "Hydroponics"
 
 /datum/supply_packs/beanbagammo
 	name = "Beanbag shells"

code/defines/obj.dm

@@ -80,17 +80,7 @@
 			var/name = t.fields["name"]
 			var/rank = t.fields["rank"]
 			var/real_rank = t.fields["real_rank"]
-
-			var/active = 0
-			for(var/mob/M in player_list) if(M.name == name)
-				// For dead ones, have a chance to get their status wrong
-				if(M.stat == 2)
-					active = M.x % 2 // Should be good enough, avoids their status flipping constantly
-					break
-				else if(M.client && M.client.inactivity <= 10 * 60 * 10)
-					active = 1
-					break
-			isactive[name] = active ? "Active" : "SSD"
+			isactive[name] = t.fields["p_stat"]
 
 			//world << "[name]: [rank]"
 

code/defines/obj/weapon.dm

@@ -310,10 +310,11 @@
 	name = "shard"
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "large"
+	sharp = 1
 	desc = "Could probably be used as ... a throwing weapon?"
 	w_class = 1.0
 	force = 5.0
-	throwforce = 15.0
+	throwforce = 8.0
 	item_state = "shard-glass"
 	g_amt = 3750
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
@@ -346,6 +347,28 @@
 	m_amt = 100
 	origin_tech = "magnets=2;syndicate=3"*/
 
+/obj/item/weapon/shard/shrapnel
+	name = "shrapnel"
+	icon = 'icons/obj/shards.dmi'
+	icon_state = "shrapnellarge"
+	desc = "A bunch of tiny bits of shattered metal."
+
+/obj/item/weapon/shard/shrapnel/New()
+
+	src.icon_state = pick("shrapnellarge", "shrapnelmedium", "shrapnelsmall")
+	switch(src.icon_state)
+		if("shrapnelsmall")
+			src.pixel_x = rand(-12, 12)
+			src.pixel_y = rand(-12, 12)
+		if("shrapnelmedium")
+			src.pixel_x = rand(-8, 8)
+			src.pixel_y = rand(-8, 8)
+		if("shrapnellarge")
+			src.pixel_x = rand(-5, 5)
+			src.pixel_y = rand(-5, 5)
+		else
+	return
+
 /obj/item/weapon/SWF_uplink
 	name = "station-bounced radio"
 	desc = "used to comunicate it appears."
@@ -522,7 +545,7 @@
 	icon_state = "hatchet"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 12.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 15.0
 	throw_speed = 4
 	throw_range = 4

code/game/area/Space Station 13 areas.dm

@@ -1003,18 +1003,39 @@ proc/process_ghost_teleport_locs()
 //MedBay
 
 /area/medical/medbay
-	name = "Medbay"
+	name = "\improper Medbay"
 	icon_state = "medbay"
 	music = 'sound/ambience/signal.ogg'
 
 //Medbay is a large area, these additional areas help level out APC load.
 /area/medical/medbay2
-	name = "Medbay"
+	name = "\improper Medbay"
 	icon_state = "medbay2"
 	music = 'sound/ambience/signal.ogg'
 
 /area/medical/medbay3
-	name = "Medbay"
+	name = "\improper Medbay"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+
+/area/medical/biostorage
+	name = "\improper Secondary Storage"
+	icon_state = "medbay2"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/reception
+	name = "\improper Medbay Reception"
+	icon_state = "medbay"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/psych
+	name = "\improper Psych Room"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/medbreak
+	name = "\improper Break Room"
 	icon_state = "medbay3"
 	music = 'sound/ambience/signal.ogg'
 
@@ -1022,20 +1043,44 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Patient's Rooms"
 	icon_state = "patients"
 
+/area/medical/ward
+	name = "\improper Medbay Patient Ward"
+	icon_state = "patients"
+
+/area/medical/patient_a
+	name = "\improper Isolation A"
+	icon_state = "patients"
+
+/area/medical/patient_b
+	name = "\improper Isolation B"
+	icon_state = "patients"
+
+/area/medical/patient_c
+	name = "\improper Isolation C"
+	icon_state = "patients"
+
+/area/medical/iso_access
+	name = "\improper Isolation Access"
+	icon_state = "patients"
+
 /area/medical/cmo
 	name = "\improper Chief Medical Officer's office"
 	icon_state = "CMO"
 
+/area/medical/cmostore
+	name = "\improper Secure Storage"
+	icon_state = "CMO"
+
 /area/medical/robotics
-	name = "Robotics"
+	name = "\improper Robotics"
 	icon_state = "medresearch"
 
 /area/medical/research
-	name = "Medical Research"
+	name = "\improper Medical Research"
 	icon_state = "medresearch"
 
 /area/medical/virology
-	name = "Virology"
+	name = "\improper Virology"
 	icon_state = "virology"
 
 /area/medical/morgue
@@ -1043,15 +1088,19 @@ proc/process_ghost_teleport_locs()
 	icon_state = "morgue"
 
 /area/medical/chemistry
-	name = "Chemistry"
+	name = "\improper Chemistry"
 	icon_state = "chem"
 
 /area/medical/surgery
-	name = "Surgery"
+	name = "\improper Surgery"
+	icon_state = "surgery"
+
+/area/medical/surgeryobs
+	name = "\improper Surgery Observation"
 	icon_state = "surgery"
 
 /area/medical/cryo
-	name = "Cryogenics"
+	name = "\improper Cryogenics"
 	icon_state = "cryo"
 
 /area/medical/exam_room
@@ -1059,15 +1108,15 @@ proc/process_ghost_teleport_locs()
 	icon_state = "exam_room"
 
 /area/medical/genetics
-	name = "Genetics Lab"
+	name = "\improper Genetics Lab"
 	icon_state = "genetics"
 
 /area/medical/genetics_cloning
-	name = "Cloning Lab"
+	name = "\improper Cloning Lab"
 	icon_state = "cloning"
 
 /area/medical/sleeper
-	name = "Medbay Treatment Center"
+	name = "\improper Emergency"
 	icon_state = "exam_room"
 
 //Security

code/game/area/areas.dm

@@ -53,7 +53,7 @@
 						aiPlayer.cancelAlarm("Power", src, source)
 					else
 						aiPlayer.triggerAlarm("Power", src, cameras, source)
-			for(var/obj/machinery/computer/station_alert/a in world)
+			for(var/obj/machinery/computer/station_alert/a in machines)
 				if(a.z == source.z)
 					if(state == 1)
 						a.cancelAlarm("Power", src, source)
@@ -75,12 +75,12 @@
 					cameras += C
 			for(var/mob/living/silicon/aiPlayer in player_list)
 				aiPlayer.triggerAlarm("Atmosphere", src, cameras, src)
-			for(var/obj/machinery/computer/station_alert/a in world)
+			for(var/obj/machinery/computer/station_alert/a in machines)
 				a.triggerAlarm("Atmosphere", src, cameras, src)
 		else if (atmosalm == 2)
 			for(var/mob/living/silicon/aiPlayer in player_list)
 				aiPlayer.cancelAlarm("Atmosphere", src, src)
-			for(var/obj/machinery/computer/station_alert/a in world)
+			for(var/obj/machinery/computer/station_alert/a in machines)
 				a.cancelAlarm("Atmosphere", src, src)
 		atmosalm = danger_level
 		return 1
@@ -105,7 +105,7 @@
 			cameras += C
 		for (var/mob/living/silicon/ai/aiPlayer in player_list)
 			aiPlayer.triggerAlarm("Fire", src, cameras, src)
-		for (var/obj/machinery/computer/station_alert/a in world)
+		for (var/obj/machinery/computer/station_alert/a in machines)
 			a.triggerAlarm("Fire", src, cameras, src)
 
 /area/proc/firereset()
@@ -122,7 +122,7 @@
 					D.open()
 		for (var/mob/living/silicon/ai/aiPlayer in player_list)
 			aiPlayer.cancelAlarm("Fire", src, src)
-		for (var/obj/machinery/computer/station_alert/a in world)
+		for (var/obj/machinery/computer/station_alert/a in machines)
 			a.cancelAlarm("Fire", src, src)
 
 /area/proc/readyalert()

code/game/atoms.dm

@@ -21,10 +21,10 @@
 	//Detective Work, used for the duplicate data points kept in the scanners
 	var/list/original_atom
 
-/atom/proc/throw_impact(atom/hit_atom)
+/atom/proc/throw_impact(atom/hit_atom, var/speed)
 	if(istype(hit_atom,/mob/living))
 		var/mob/living/M = hit_atom
-		M.hitby(src)
+		M.hitby(src,speed)
 
 		log_attack("<font color='red'>[hit_atom] ([M.ckey]) was hit by [src] thrown by ([src.fingerprintslast])</font>")
 
@@ -32,7 +32,7 @@
 		var/obj/O = hit_atom
 		if(!O.anchored)
 			step(O, src.dir)
-		O.hitby(src)
+		O.hitby(src,speed)
 
 	else if(isturf(hit_atom))
 		var/turf/T = hit_atom
@@ -214,7 +214,7 @@ its easier to just keep the beam vertical.
 /atom/verb/examine()
 	set name = "Examine"
 	set category = "IC"
-	set src in oview(12)	//make it work from farther away
+	set src in view(usr.client) //If it can be seen, it can be examined.
 
 	if (!( usr ))
 		return

code/game/atoms_movable.dm

@@ -44,18 +44,18 @@
 		return 1
 	return 0
 
-/atom/movable/proc/hit_check()
+/atom/movable/proc/hit_check(var/speed)
 	if(src.throwing)
 		for(var/atom/A in get_turf(src))
 			if(A == src) continue
 			if(istype(A,/mob/living))
 				if(A:lying) continue
-				src.throw_impact(A)
+				src.throw_impact(A,speed)
 				if(src.throwing == 1)
 					src.throwing = 0
 			if(isobj(A))
 				if(A.density && !A.throwpass)	// **TODO: Better behaviour for windows which are dense, but shouldn't always stop movement
-					src.throw_impact(A)
+					src.throw_impact(A,speed)
 					src.throwing = 0
 
 /atom/movable/proc/throw_at(atom/target, range, speed)
@@ -97,7 +97,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error += dist_x
 				dist_travelled++
 				dist_since_sleep++
@@ -109,7 +109,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error -= dist_y
 				dist_travelled++
 				dist_since_sleep++
@@ -126,7 +126,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error += dist_y
 				dist_travelled++
 				dist_since_sleep++
@@ -138,7 +138,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error -= dist_x
 				dist_travelled++
 				dist_since_sleep++
@@ -150,7 +150,7 @@
 
 	//done throwing, either because it hit something or it finished moving
 	src.throwing = 0
-	if(isobj(src)) src:throw_impact(get_turf(src))
+	if(isobj(src)) src:throw_impact(get_turf(src),speed)
 
 
 //Overlays

code/game/dna.dm

@@ -548,7 +548,17 @@
 			sleep(48)
 			del(animation)
 
-		var/mob/living/carbon/monkey/O = new(src)
+
+		var/mob/living/carbon/monkey/O = null
+		switch(M.dna.mutantrace)
+			if("tajaran")
+				O = new /mob/living/carbon/monkey/tajara(src)
+			if("lizard")
+				O = new /mob/living/carbon/monkey/unathi(src)
+			if("skrell")
+				O = new /mob/living/carbon/monkey/skrell(src)
+			else
+				O = new /mob/living/carbon/monkey(src)
 
 		if(M)
 			if (M.dna)

code/game/gamemodes/autotraitor/autotraitor.dm

@@ -11,7 +11,7 @@
 
 /datum/game_mode/traitor/autotraitor/announce()
 	..()
-	world << "<B>Game mode is AutoTraitor. Traitors will be added to the round automagically as needed.<br>Expect bugs.</B>"
+	world << "<B>Game mode is AutoTraitor. Traitors will be added to the round automagically as needed.</B>"
 
 /datum/game_mode/traitor/autotraitor/pre_setup()
 
@@ -81,7 +81,7 @@
 		var/playercount = 0
 		var/traitorcount = 0
 		var/possible_traitors[0]
-		for(var/mob/living/player in world)
+		for(var/mob/living/player in mob_list)
 
 			if (player.client && player.stat != 2)
 				playercount += 1
@@ -153,7 +153,7 @@
 		//message_admins("Checking number of players")
 		var/playercount = 0
 		var/traitorcount = 0
-		for(var/mob/living/player in world)
+		for(var/mob/living/player in mob_list)
 
 			if (player.client && player.stat != 2)
 				playercount += 1

code/game/gamemodes/blob/blob_report.dm

@@ -19,7 +19,7 @@
 			intercepttext += "Message ends."
 		if(2)
 			var/nukecode = "ERROR"
-			for(var/obj/machinery/nuclearbomb/bomb in world)
+			for(var/obj/machinery/nuclearbomb/bomb in machines)
 				if(bomb && bomb.r_code)
 					if(bomb.z == 1)
 						nukecode = bomb.r_code
@@ -39,7 +39,7 @@
 					aiPlayer.set_zeroth_law(law)
 					aiPlayer << "Laws Updated: [law]"
 
-	for(var/obj/machinery/computer/communications/comm in world)
+	for(var/obj/machinery/computer/communications/comm in machines)
 		comm.messagetitle.Add(interceptname)
 		comm.messagetext.Add(intercepttext)
 		if(!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept)

code/game/gamemodes/changeling/changeling_powers.dm

@@ -106,7 +106,10 @@
 				src << "<span class='notice'>We stab [T] with the proboscis.</span>"
 				src.visible_message("<span class='danger'>[src] stabs [T] with the proboscis!</span>")
 				T << "<span class='danger'>You feel a sharp stabbing pain!</span>"
-				T.take_overall_damage(40)
+				var/datum/organ/external/affecting = T.get_organ(src.zone_sel.selecting)
+				if(affecting.take_damage(39,0,1,"large organic needle"))
+					T:UpdateDamageIcon()
+					continue
 
 		feedback_add_details("changeling_powers","A[stage]")
 		if(!do_mob(src, T, 150))

code/game/gamemodes/events.dm

@@ -186,7 +186,7 @@
 	//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
 	//world << sound('sound/AI/aliens.ogg')
 	var/list/vents = list()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
+	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
 		if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
 			if(temp_vent.network.normal_members.len > 50) // Stops Aliens getting stuck in small networks. See: Security, Virology
 				vents += temp_vent
@@ -325,7 +325,7 @@
 				apc.overload_lighting()
 
 	else
-		for(var/obj/machinery/power/apc/apc in world)
+		for(var/obj/machinery/power/apc/apc in machines)
 			apc.overload_lighting()
 
 	return
@@ -436,7 +436,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 					M.add_ion_law("THE STATION IS [who2pref] [who2]")
 
 	if(botEmagChance)
-		for(var/obj/machinery/bot/bot in world)
+		for(var/obj/machinery/bot/bot in machines)
 			if(prob(botEmagChance))
 				bot.Emag()
 

code/game/gamemodes/events/ninja_abilities.dm

@@ -65,45 +65,11 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 		s_coold = 1
 	return
 
-//=======//9-8 TILE TELEPORT//=======//
-//Click to to teleport 9-10 tiles in direction facing.
-/obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt()
-	set name = "Phase Jaunt (10E)"
-	set desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
-	set category = "Ninja Ability"
-	set popup_menu = 0
-
-	var/C = 100
-	if(!ninjacost(C,1))
-		var/mob/living/carbon/human/U = affecting
-		var/turf/destination = get_teleport_loc(U.loc,U,9,1,3,1,0,1)
-		var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
-		if(destination&&istype(mobloc, /turf))//The turf check prevents unusual behavior. Like teleporting out of cryo pods, cloners, mechs, etc.
-			spawn(0)
-				playsound(U.loc, "sparks", 50, 1)
-				anim(mobloc,src,'icons/mob/mob.dmi',,"phaseout",,U.dir)
-
-			handle_teleport_grab(destination, U)
-			U.loc = destination
-
-			spawn(0)
-				spark_system.start()
-				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
-				playsound(U.loc, "sparks", 50, 1)
-				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
-
-			spawn(0)
-				destination.kill_creatures(U)//Any living mobs in teleport area are gibbed. Check turf procs for how it does it.
-			s_coold = 1
-			cell.charge-=(C*10)
-		else
-			U << "\red The VOID-shift device is malfunctioning, <B>teleportation failed</B>."
-	return
 
 //=======//RIGHT CLICK TELEPORT//=======//
 //Right click to teleport somewhere, almost exactly like admin jump to turf.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjashift(turf/T in oview())
-	set name = "Phase Shift (20E)"
+	set name = "Phase Shift (1E)"
 	set desc = "Utilizes the internal VOID-shift device to rapidly transit to a destination in view."
 	set category = null//So it does not show up on the panel but can still be right-clicked.
 	set src = usr.contents//Fixes verbs not attaching properly for objects. Praise the DM reference guide!
@@ -125,11 +91,6 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
 				playsound(U.loc, 'sound/effects/sparks2.ogg', 50, 1)
 				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
-
-			spawn(0)//Any living mobs in teleport area are gibbed.
-				T.kill_creatures(U)
-			s_coold = 1
-			cell.charge-=(C*10)
 		else
 			U << "\red You cannot teleport into solid walls or from solid matter"
 	return
@@ -137,16 +98,16 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 //=======//EM PULSE//=======//
 //Disables nearby tech equipment.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
-	set name = "EM Burst (25E)"
+	set name = "EM Burst (1,000E)"
 	set desc = "Disable any nearby technology with a electro-magnetic pulse."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
 	var/C = 250
-	if(!ninjacost(C,1))
+	if(!ninjacost(C,100)) // EMP's now cost 1,000Energy about 30%
 		var/mob/living/carbon/human/U = affecting
 		playsound(U.loc, 'sound/effects/EMPulse.ogg', 60, 2)
-		empulse(U, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
+		empulse(U, 2, 3) //Procs sure are nice. Slightly weaker than wizard's disable tch.
 		s_coold = 2
 		cell.charge-=(C*10)
 	return
@@ -154,13 +115,13 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 //=======//ENERGY BLADE//=======//
 //Summons a blade of energy in active hand.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjablade()
-	set name = "Energy Blade (5E)"
+	set name = "Energy Blade (20E)"
 	set desc = "Create a focused beam of energy in your active hand."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
 	var/C = 50
-	if(!ninjacost(C))
+	if(!ninjacost(C, 800)) //Same spawn cost but higher upkeep cost
 		var/mob/living/carbon/human/U = affecting
 		if(!kamikaze)
 			if(!U.get_active_hand()&&!istype(U.get_inactive_hand(), /obj/item/weapon/melee/energy/blade))
@@ -187,13 +148,13 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 /*Shoots ninja stars at random people.
 This could be a lot better but I'm too tired atm.*/
 /obj/item/clothing/suit/space/space_ninja/proc/ninjastar()
-	set name = "Energy Star (5E)"
+	set name = "Energy Star (1,000E)"
 	set desc = "Launches an energy star at a random living target."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
 	var/C = 50
-	if(!ninjacost(C))
+	if(!ninjacost(C,1))
 		var/mob/living/carbon/human/U = affecting
 		var/targets[] = list()//So yo can shoot while yo throw dawg
 		for(var/mob/living/M in oview(loc))
@@ -212,7 +173,7 @@ This could be a lot better but I'm too tired atm.*/
 			A.current = curloc
 			A.yo = targloc.y - curloc.y
 			A.xo = targloc.x - curloc.x
-			cell.charge-=(C*10)
+			cell.charge-=(C*100)// Ninja stars now cost 100 energy, stil la fair chunk to avoid spamming, will run out of power quickly if used 3 or more times
 			A.process()
 		else
 			U << "\red There are no targets in view."
@@ -222,13 +183,13 @@ This could be a lot better but I'm too tired atm.*/
 /*Allows the ninja to capture people, I guess.
 Must right click on a mob to activate.*/
 /obj/item/clothing/suit/space/space_ninja/proc/ninjanet(mob/living/carbon/M in oview())//Only living carbon mobs.
-	set name = "Energy Net (20E)"
+	set name = "Energy Net (8,000E)"
 	set desc = "Captures a fallen opponent in a net of energy. Will teleport them to a holding facility after 30 seconds."
 	set category = null
 	set src = usr.contents
 
-	var/C = 200
-	if(!ninjacost(C,1)&&iscarbon(M))
+	var/C = 500
+	if(!ninjacost(C,80)&&iscarbon(M)) // Nets now cost 8,000
 		var/mob/living/carbon/human/U = affecting
 		if(M.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame.
 		//if(M)//DEBUG
@@ -249,7 +210,7 @@ Must right click on a mob to activate.*/
 				E.master = U
 				spawn(0)//Parallel processing.
 					E.process(M)
-				cell.charge-=(C*10)
+				cell.charge-=(C*100) // Nets now cost what should be most of a standard battery, since your taking someone out of the round
 			else
 				U << "They are already trapped inside an energy net."
 		else
@@ -270,7 +231,6 @@ Movement impairing would indicate drugs and the like.*/
 		//Wouldn't need to track adrenaline boosters if there was a miracle injection to get rid of paralysis and the like instantly.
 		//For now, adrenaline boosters ARE the miracle injection. Well, radium, really.
 		U.SetParalysis(0)
-		U.SetStunned(0)
 		U.SetWeakened(0)
 	/*
 	Due to lag, it was possible to adrenaline boost but remain helpless while life.dm resets player stat.

code/game/gamemodes/events/ninja_equipment.dm

@@ -243,7 +243,7 @@ ________________________________________________________________________________
 	var/mob/living/silicon/ai/A = AI
 	var/display_to = s_control ? U : A//Who do we want to display certain messages to?
 
-	var/dat = "<html><head><title>SpiderOS</title></head><body bgcolor=\"#3D5B43\" text=\"#DB2929\"><style>a, a:link, a:visited, a:active, a:hover { color: #DB2929; }img {border-style:none;}</style>"
+	var/dat = "<html><head><title>SpiderOS</title></head><body bgcolor=\"#3D5B43\" text=\"#B65B5B\"><style>a, a:link, a:visited, a:active, a:hover { color: #B65B5B; }img {border-style:none;}</style>"
 	dat += "<a href='byond://?src=\ref[src];choice=Refresh'><img src=sos_7.png> Refresh</a>"
 	if(spideros)
 		dat += " | <a href='byond://?src=\ref[src];choice=Return'><img src=sos_1.png> Return</a>"
@@ -1209,7 +1209,7 @@ ________________________________________________________________________________
 					U.client.images += image(tempHud,target,"hudoperative")
 				if("Death Commando")
 					U.client.images += image(tempHud,target,"huddeathsquad")
-				if("Space Ninja")
+				if("Ninja")
 					U.client.images += image(tempHud,target,"hudninja")
 				else//If we don't know what role they have but they have one.
 					U.client.images += image(tempHud,target,"hudunknown1")
@@ -1333,10 +1333,10 @@ It is possible to destroy the net by the occupant or someone else.
 			return
 
 	process(var/mob/living/carbon/M as mob)
-		var/check = 30//30 seconds before teleportation. Could be extended I guess.
+		var/check = 60//30 seconds before teleportation. Could be extended I guess. - Extended to one minute
 		var/mob_name = affecting.name//Since they will report as null if terminated before teleport.
 		//The person can still try and attack the net when inside.
-		while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 30 seconds have not passed.
+		while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 60 seconds have not passed.
 			check--
 			sleep(10)
 

code/game/gamemodes/events/space_ninja.dm

@@ -52,7 +52,7 @@ ________________________________________________________________________________
 	How to do that:
 	Make sure your character has a mind.
 	Change their assigned_role to "MODE", no quotes. Otherwise, the suit won't initialize.
-	Change their special_role to "Space Ninja", no quotes. Otherwise, the character will be gibbed.
+	Change their special_role to "Ninja", no quotes. Otherwise, the character will be gibbed.
 	Spawn ninja gear, put it on, hit initialize. Let the suit do the rest. You are now a space ninja.
 	I don't recommend messing with suit variables unless you really know what you're doing.
 
@@ -140,15 +140,10 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 */
 
 	//Here we pick a location and spawn the ninja.
-	var/list/spawn_list = list()
-	for(var/obj/effect/landmark/L in landmarks_list)
-		if(L.name == "ninjaspawn")
-			spawn_list.Add(L)
-
-	if(!spawn_list.len)
+	if(ninjastart.len == 0)
 		for(var/obj/effect/landmark/L in landmarks_list)
 			if(L.name == "carpspawn")
-				spawn_list.Add(L)
+				ninjastart.Add(L)
 
 	var/ninja_key = null
 	var/mob/candidate_mob
@@ -211,7 +206,7 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 		ninja_selection_active = 0
 
 		//The ninja will be created on the right spawn point or at late join.
-		var/mob/living/carbon/human/new_ninja = create_space_ninja(pick(spawn_list.len ? spawn_list : latejoin ))
+		var/mob/living/carbon/human/new_ninja = create_space_ninja(pick(ninjastart.len ? ninjastart : latejoin))
 		new_ninja.key = ninja_key
 		new_ninja.wear_suit:randomize_param()//Give them a random set of suit parameters.
 		new_ninja.internal = new_ninja.s_store //So the poor ninja has something to breath when they spawn in spess.
@@ -241,8 +236,8 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 				if(xeno_queen_list.len&&side=="face")//If there are queen about and the probability is 50.
 					for(var/mob/living/carbon/alien/humanoid/queen/xeno_queen in xeno_queen_list)
 						var/datum/objective/assassinate/ninja_objective = new
-						//We'll do some manual overrides to properly set it up.
 						ninja_objective.owner = ninja_mind
+						//We'll do some manual overrides to properly set it up.
 						ninja_objective.target = xeno_queen.mind
 						ninja_objective.explanation_text = "Kill \the [xeno_queen]."
 						ninja_mind.objectives += ninja_objective
@@ -307,6 +302,7 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 							hostile_targets -= current_mind//Remove them from the list.
 						if(2)//Steal
 							var/datum/objective/steal/ninja_objective = new
+							ninja_objective.owner = ninja_mind
 							var/target_item = pick(ninja_objective.possible_items_special)
 							ninja_objective.set_target(target_item)
 							ninja_mind.objectives += ninja_objective
@@ -342,12 +338,14 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 							hostile_targets -= current_mind//Remove them from the list.
 						if(5)//Download research
 							var/datum/objective/download/ninja_objective = new
+							ninja_objective.owner = ninja_mind
 							ninja_objective.gen_amount_goal()
 							ninja_mind.objectives += ninja_objective
 
 							objective_list -= 5
 						if(6)//Capture
 							var/datum/objective/capture/ninja_objective = new
+							ninja_objective.owner = ninja_mind
 							ninja_objective.gen_amount_goal()
 							ninja_mind.objectives += ninja_objective
 
@@ -394,17 +392,17 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 */
 /proc/generate_ninja_directive(side)
 	var/directive = "[side=="face"?"Nanotrasen":"The Syndicate"] is your employer. "//Let them know which side they're on.
-	switch(rand(1,13))
+	switch(rand(1,19))
 		if(1)
-			directive += "The Spider Clan must not be linked to this operation. Remain as hidden and covert as possible."
+			directive += "The Spider Clan must not be linked to this operation. Remain hidden and covert when possible."
 		if(2)
-			directive += "[station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as possible."
+			directive += "[station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as desired."
 		if(3)
 			directive += "A wealthy animal rights activist has made a request we cannot refuse. Prioritize saving animal lives whenever possible."
 		if(4)
-			directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate all witnesses using most extreme prejudice."
+			directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate witnesses at your discretion."
 		if(5)
-			directive += "We are currently negotiating with Nanotrasen command. Prioritize saving human lives over ending them."
+			directive += "We are currently negotiating with NanoTrasen Central Command. Prioritize saving human lives over ending them."
 		if(6)
 			directive += "We are engaged in a legal dispute over [station_name]. If a laywer is present on board, force their cooperation in the matter."
 		if(7)
@@ -414,11 +412,24 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 		if(9)
 			directive += "A free agent has proposed a lucrative business deal. Implicate Nanotrasen involvement in the operation."
 		if(10)
-			directive += "Our reputation is on the line. Harm as few civilians or innocents as possible."
+			directive += "Our reputation is on the line. Harm as few civilians and innocents as possible."
 		if(11)
 			directive += "Our honor is on the line. Utilize only honorable tactics when dealing with opponents."
 		if(12)
-			directive += "We are currently negotiating with a Syndicate leader. Disguise assassinations as suicide or another natural cause."
+			directive += "We are currently negotiating with a Syndicate leader. Disguise assassinations as suicide or other natural causes."
+		if(13)
+			directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff."
+		if(14)
+			var/xenorace = pick("Unathi","Tajaran", "Skrellian")
+			directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
+		if(15)
+			directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."
+		if(16)
+			directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine NanoTrasen prosthetics in a bad light."
+		if(17)
+			directive += "The Spider Clan has recently begun recruiting outsiders. Consider suitable candidates and assess their behavior amongst the crew."
+		if(18)
+			directive += "A cyborg liberation group has expressed interest in our serves. Prove the Spider Clan merciful towards law-bound synthetics."
 		else
 			directive += "There are no special supplemental instructions at this time."
 	return directive
@@ -508,10 +519,9 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 /mob/living/carbon/human/proc/create_mind_space_ninja()
 	mind_initialize()
 	mind.assigned_role = "MODE"
-	mind.special_role = "Space Ninja"
+	mind.special_role = "Ninja"
 
-	//Adds them to current traitor list. Which is really the extra antagonist list.
-	ticker.mode.traitors |= mind
+	//ticker.mode.ninjas |= mind
 	return 1
 
 /mob/living/carbon/human/proc/equip_space_ninja(safety=0)//Safety in case you need to unequip stuff for existing characters.
@@ -559,7 +569,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 		U:gloves.icon_state = "s-ninjan"
 		U:gloves.item_state = "s-ninjan"
 	else
-		if(U.mind.special_role!="Space Ninja")
+		if(U.mind.special_role!="Ninja")
 			U << "\red <B>fÄTaL ÈÈRRoR</B>: 382200-*#00CÖDE <B>RED</B>\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..."
 			U.gib()
 			return 0
@@ -656,7 +666,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 /obj/item/clothing/suit/space/space_ninja/proc/grant_ninja_verbs()
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
@@ -669,8 +678,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 /obj/item/clothing/suit/space/space_ninja/proc/remove_ninja_verbs()
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjablade
@@ -681,11 +688,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 /obj/item/clothing/suit/space/space_ninja/proc/grant_kamikaze(mob/living/carbon/U)
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
-
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjaslayer
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjawalk
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjamirage
@@ -710,11 +713,8 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 /obj/item/clothing/suit/space/space_ninja/proc/remove_kamikaze(mob/living/carbon/U)
 	if(kamikaze)
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
-		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
-
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjaslayer
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjawalk
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjamirage

code/game/gamemodes/game_mode.dm

@@ -243,7 +243,7 @@ Implants;
 			else
 				intercepttext += "<b>[M.name]</b>, the <b>[M.mind.assigned_role]</b> <br>"
 
-	for (var/obj/machinery/computer/communications/comm in world)
+	for (var/obj/machinery/computer/communications/comm in machines)
 		if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept)
 			var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc )
 			intercept.name = "paper- 'Cent. Com. Status Summary'"
@@ -261,11 +261,11 @@ Implants;
 		set_security_level(SEC_LEVEL_BLUE)*/
 
 
-/datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=1)
+/datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=0)
 	var/list/players = list()
 	var/list/candidates = list()
-	var/list/drafted = list()
-	var/datum/mind/applicant = null
+	//var/list/drafted = list()
+	//var/datum/mind/applicant = null
 
 	var/roletext
 	switch(role)
@@ -275,31 +275,42 @@ Implants;
 		if(BE_WIZARD)		roletext="wizard"
 		if(BE_REV)			roletext="revolutionary"
 		if(BE_CULTIST)		roletext="cultist"
+		if(BE_NINJA)		roletext="ninja"
 
-
-	// Ultimate randomizing code right here
+	// Assemble a list of active players without jobbans.
 	for(var/mob/new_player/player in player_list)
-		if(player.client && player.ready)
-			players += player
+		if( player.client && player.ready )
+			if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, roletext))
+				players += player
 
-	// Shuffling, the players list is now ping-independent!!!
-	// Goodbye antag dante
+	// Shuffle the players list so that it becomes ping-independent.
 	players = shuffle(players)
 
+	// Get a list of all the people who want to be the antagonist for this round
 	for(var/mob/new_player/player in players)
-		if(player.client && player.ready)
-			if(player.client.prefs.be_special & role)
-				if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, roletext)) //Nodrak/Carn: Antag Job-bans
-					candidates += player.mind				// Get a list of all the people who want to be the antagonist for this round
-					log_debug("[player.key] had [roletext] enabled, so drafting them.")
+		if(player.client.prefs.be_special & role)
+			log_debug("[player.key] had [roletext] enabled, so we are drafting them.")
+			candidates += player.mind
+			players -= player
 
+	// If we don't have enough antags, draft people who voted for the round.
+	if(candidates.len < recommended_enemies)
+		for(var/key in round_voters)
+			for(var/mob/new_player/player in players)
+				if(player.ckey == key)
+					log_debug("[player.key] voted for this round, so we are drafting them.")
+					candidates += player.mind
+					players -= player
+					break
+
+	// Remove candidates who want to be antagonist but have a job that precludes it
 	if(restricted_jobs)
 		for(var/datum/mind/player in candidates)
-			for(var/job in restricted_jobs)					// Remove people who want to be antagonist but have a job already that precludes it
+			for(var/job in restricted_jobs)
 				if(player.assigned_role == job)
 					candidates -= player
 
-	if(candidates.len < recommended_enemies)
+	/*if(candidates.len < recommended_enemies)
 		for(var/mob/new_player/player in players)
 			if(player.client && player.ready)
 				if(!(player.client.prefs.be_special & role)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one
@@ -349,6 +360,7 @@ Implants;
 
 		else												// Not enough scrubs, ABORT ABORT ABORT
 			break
+	*/
 
 	return candidates		// Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies
 							//			recommended_enemies if the number of people with that role set to yes is less than recomended_enemies,

code/game/gamemodes/gameticker.dm

@@ -108,7 +108,7 @@ var/global/datum/controller/gameticker/ticker
 
 	//setup the money accounts
 	if(!centcomm_account_db)
-		for(var/obj/machinery/account_database/check_db in world)
+		for(var/obj/machinery/account_database/check_db in machines)
 			if(check_db.z == 2)
 				centcomm_account_db = check_db
 				break

code/game/gamemodes/ninja/ninja.dm

@@ -0,0 +1,181 @@
+/datum/game_mode/var/list/datum/mind/ninjas = list()
+// Keep in mind ninja-procs that aren't here will be where the event's defined
+/datum/game_mode/ninja
+	name = "ninja"
+	config_tag = "ninja"
+	required_players = 10 //Can be adjusted later, should suffice for now.
+	required_players_secret = 10
+	required_enemies = 1
+	recommended_enemies = 1
+	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
+	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
+	var/finished = 0
+
+/datum/game_mode/ninja/announce()
+	world << "<B>The current game mode is Ninja!</B>"
+
+/datum/game_mode/ninja/can_start()
+	if(!..())
+		return 0
+	var/list/datum/mind/possible_ninjas = get_players_for_role(BE_NINJA)
+	if(possible_ninjas.len==0)
+		return 0
+	var/datum/mind/ninja = pick(possible_ninjas)
+	ninjas += ninja
+	modePlayer += ninja
+	ninja.assigned_role = "MODE" //So they aren't chosen for other jobs.
+	ninja.special_role = "Ninja"
+	ninja.original = ninja.current
+	if(ninjastart.len == 0)
+		ninja.current << "<B>\red A proper starting location for you could not be found, please report this bug!</B>"
+		ninja.current << "<B>\red Attempting to place at a carpspawn.</B>"
+		for(var/obj/effect/landmark/L in landmarks_list)
+			if(L.name == "carpspawn")
+				ninjastart.Add(L)
+		if(ninjastart.len == 0 && latejoin.len > 0)
+			ninja.current << "<B>\red Still no spawneable locations could be found. Defaulting to latejoin.</B>"
+			return 1
+		else if (ninjastart.len == 0)
+			ninja.current << "<B>\red Still no spawneable locations could be found. Aborting.</B>"
+			return 0
+	return 1
+
+/datum/game_mode/ninja/pre_setup()
+	for(var/datum/mind/ninja in ninjas)
+		ninja.current << browse(null, "window=playersetup")
+		ninja.current = create_space_ninja(pick(ninjastart.len ? ninjastart : latejoin))
+		ninja.current.ckey = ninja.key
+	return 1
+
+/datum/game_mode/ninja/post_setup()
+	for(var/datum/mind/ninja in ninjas)
+		if(ninja.current && !(istype(ninja.current,/mob/living/carbon/human))) return 0
+		//forge_ninja_objectives(ninja)
+		var/mob/living/carbon/human/N = ninja.current
+		N.internal = N.s_store
+		N.internals.icon_state = "internal1"
+		if(N.wear_suit && istype(N.wear_suit,/obj/item/clothing/suit/space/space_ninja))
+			var/obj/item/clothing/suit/space/space_ninja/S = N.wear_suit
+			S:randomize_param()
+	spawn (rand(waittime_l, waittime_h))
+		send_intercept()
+	return ..()
+
+/datum/game_mode/ninja/check_finished()
+	if(config.continous_rounds)
+		return ..()
+	var/ninjas_alive = 0
+	for(var/datum/mind/ninja in ninjas)
+		if(!istype(ninja.current,/mob/living/carbon/human))
+			continue
+		if(ninja.current.stat==2)
+			continue
+		ninjas_alive++
+	if (ninjas_alive)
+		return ..()
+	else
+		finished = 1
+		return 1
+
+/datum/game_mode/ninja/proc/forge_ninja_objectives(var/datum/mind/ninja)
+	var/objective_list[] = list(1,2,3,4,5)
+	for(var/i=rand(2,4),i>0,i--)
+		switch(pick(objective_list))
+			if(1)//Kill
+				var/datum/objective/assassinate/ninja_objective = new
+				ninja_objective.owner = ninja
+				ninja_objective.target = ninja_objective.find_target()
+				if(ninja_objective.target != "Free Objective")
+					ninja.objectives += ninja_objective
+				else
+					i++
+				objective_list -= 1 // No more than one kill objective
+			if(2)//Steal
+				var/datum/objective/steal/ninja_objective = new
+				ninja_objective.owner = ninja
+				ninja_objective.target = ninja_objective.find_target()
+				ninja.objectives += ninja_objective
+			if(3)//Protect
+				var/datum/objective/protect/ninja_objective = new
+				ninja_objective.owner = ninja
+				ninja_objective.target = ninja_objective.find_target()
+				if(ninja_objective.target != "Free Objective")
+					ninja.objectives += ninja_objective
+				else
+					i++
+					objective_list -= 3
+			if(4)//Download
+				var/datum/objective/download/ninja_objective = new
+				ninja_objective.owner = ninja
+				ninja_objective.gen_amount_goal()
+				ninja.objectives += ninja_objective
+				objective_list -= 4
+			if(5)//Harm
+				var/datum/objective/harm/ninja_objective = new
+				ninja_objective.owner = ninja
+				ninja_objective.target = ninja_objective.find_target()
+				if(ninja_objective.target != "Free Objective")
+					ninja.objectives += ninja_objective
+				else
+					i++
+					objective_list -= 5
+
+	var/datum/objective/survive/ninja_objective = new
+	ninja_objective.owner = ninja
+	ninja.objectives += ninja_objective
+
+	var/directive = generate_ninja_directive("heel")//Only hired by antags, not NT
+	ninja.current << "You are an elite mercenary assassin of the Spider Clan, [ninja.current.real_name]. You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor.\nYour current directive is: \red <B>[directive]</B>\n \blue Try your best to adhere to this."
+	ninja.store_memory("<B>Directive:</B> \red [directive]<br>")
+
+	var/obj_count = 1
+	ninja.current << "\blue Your current objectives:"
+	for(var/datum/objective/objective in ninja.objectives)
+		ninja.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
+		obj_count++
+
+/datum/game_mode/proc/auto_declare_completion_ninja()
+	if(ninjas.len)
+		var/text = "<FONT size = 2><B>The ninjas were:</B></FONT>"
+		for(var/datum/mind/ninja in ninjas)
+			var/ninjawin = 1
+
+			text += "<br>[ninja.key] was [ninja.name] ("
+			if(ninja.current)
+				if(ninja.current.stat == DEAD)
+					text += "died"
+				else
+					text += "survived"
+				if(ninja.current.real_name != ninja.name)
+					text += " as [ninja.current.real_name]"
+			else
+				text += "body destroyed"
+			text += ")"
+
+			if(ninja.objectives.len)//If the ninja had no objectives, don't need to process this.
+				var/count = 1
+				for(var/datum/objective/objective in ninja.objectives)
+					if(objective.check_completion())
+						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
+						feedback_add_details("traitor_objective","[objective.type]|SUCCESS")
+					else
+						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+						feedback_add_details("traitor_objective","[objective.type]|FAIL")
+						ninjawin = 0
+					count++
+
+			var/special_role_text
+			if(ninja.special_role)
+				special_role_text = lowertext(ninja.special_role)
+			else
+				special_role_text = "antagonist"
+
+			if(ninjawin)
+				text += "<br><font color='green'><B>The [special_role_text] was successful!</B></font>"
+				feedback_add_details("traitor_success","SUCCESS")
+			else
+				text += "<br><font color='red'><B>The [special_role_text] has failed!</B></font>"
+				feedback_add_details("traitor_success","FAIL")
+
+		world << text
+	return 1

code/game/gamemodes/nuclear/nuclear.dm

@@ -157,10 +157,10 @@
 
 
 /datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code)
-	var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
+//	var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
 	spawn(1)
-		NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen
-	synd_mind.current.real_name = "[syndicate_name()] [leader_title]"
+//		NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen
+	synd_mind.current.real_name = "[pick(first_names_male)] [pick(last_names)]"
 	if (nuke_code)
 		synd_mind.store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
 		synd_mind.current << "The nuclear authorization code is: <B>[nuke_code]</B>"
@@ -330,7 +330,7 @@
 	return 1
 
 
-/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho.
+/*/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho.
 	var/randomname = pick(last_names)
 	var/newname = copytext(sanitize(input(M,"You are the nuke operative [pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")]. Please choose a last name for your family.", "Name change",randomname)),1,MAX_NAME_LEN)
 
@@ -343,13 +343,13 @@
 			return nukelastname(M)
 
 	return newname
-
+*/
 /proc/NukeNameAssign(var/lastname,var/list/syndicates)
 	for(var/datum/mind/synd_mind in syndicates)
 		switch(synd_mind.current.gender)
 			if(MALE)
-				synd_mind.name = "[pick(first_names_male)] [lastname]"
+				synd_mind.name = "[pick(first_names_male)] [pick(last_names)]"
 			if(FEMALE)
-				synd_mind.name = "[pick(first_names_female)] [lastname]"
+				synd_mind.name = "[pick(first_names_female)] [pick(last_names)]"
 		synd_mind.current.real_name = synd_mind.name
 	return

code/game/gamemodes/objective.dm

@@ -569,6 +569,10 @@ datum/objective/steal
 					for(var/mob/living/silicon/ai/M in C)
 						if(istype(M, /mob/living/silicon/ai) && M.stat != 2) //See if any AI's are alive inside that card.
 							return 1
+
+				for(var/obj/item/clothing/suit/space/space_ninja/S in all_items) //Let an AI downloaded into a space ninja suit count
+					if(S.AI && S.AI.stat != 2)
+						return 1
 				for(var/mob/living/silicon/ai/ai in world)
 					if(istype(ai.loc, /turf))
 						var/area/check_area = get_area(ai)

code/game/gamemodes/wizard/wizard.dm

@@ -45,7 +45,6 @@
 /datum/game_mode/wizard/pre_setup()
 	for(var/datum/mind/wizard in wizards)
 		wizard.current.loc = pick(wizardstart)
-
 	return 1
 
 

code/game/jobs/access.dm

@@ -64,6 +64,7 @@
 /var/const/access_gateway = 62
 /var/const/access_sec_doors = 63 // Security front doors
 /var/const/access_psychiatrist = 64 // Psychiatrist's office
+/var/const/access_xenoarch = 65
 
 	//BEGIN CENTCOM ACCESS
 	/*Should leave plenty of room if we need to add more access levels.
@@ -209,7 +210,7 @@
 	            access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery,
 	            access_theatre, access_research, access_mining, access_mailsorting,
 	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
-	            access_keycard_auth, access_tcomsat, access_gateway)
+	            access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch)
 
 /proc/get_all_centcom_access()
 	return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
@@ -226,7 +227,7 @@
 		if(2) //medbay
 			return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo)
 		if(3) //research
-			return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd)
+			return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_xenoarch, access_rd)
 		if(4) //engineering and maintenance
 			return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_ce)
 		if(5) //command
@@ -370,6 +371,8 @@
 			return "Mining EVA"
 		if(access_xenobiology)
 			return "Xenobiology Lab"
+		if(access_xenoarch)
+			return "Xenoarchaeology"
 		if(access_hop)
 			return "Head of Personnel"
 		if(access_hos)
@@ -412,7 +415,7 @@
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", /*"Clown", "Mime", */"Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
 				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
-				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
+				"Research Director", "Scientist", "Xenobiologist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
 
 /proc/get_all_centcom_jobs()
 	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander")

code/game/jobs/job/science.dm

@@ -12,11 +12,11 @@
 	access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
 			            access_tox_storage, access_teleporter, access_sec_doors,
 			            access_research, access_robotics, access_xenobiology, access_ai_upload,
-			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway)
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch)
 	minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
 			            access_tox_storage, access_teleporter, access_sec_doors,
 			            access_research, access_robotics, access_xenobiology, access_ai_upload,
-			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway)
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch)
 	minimal_player_age = 7
 
 	equip(var/mob/living/carbon/human/H)
@@ -44,9 +44,9 @@
 	spawn_positions = 3
 	supervisors = "the research director"
 	selection_color = "#ffeeff"
-	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
-	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology)
-	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist")
+	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
+	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
+	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher")
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -63,6 +63,32 @@
 
 
 
+/datum/job/xenobiologist
+	title = "Xenobiologist"
+	flag = XENOBIOLOGIST
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the research director"
+	selection_color = "#ffeeff"
+	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
+	minimal_access = list(access_research, access_xenobiology)
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H) return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		return 1
+
+
 /datum/job/roboticist
 	title = "Roboticist"
 	flag = ROBOTICIST

code/game/jobs/jobs.dm

@@ -9,9 +9,8 @@ var/const/OFFICER			=(1<<4)
 var/const/CHIEF				=(1<<5)
 var/const/ENGINEER			=(1<<6)
 var/const/ATMOSTECH			=(1<<7)
-var/const/ROBOTICIST		=(1<<8)
-var/const/AI				=(1<<9)
-var/const/CYBORG			=(1<<10)
+var/const/AI				=(1<<8)
+var/const/CYBORG			=(1<<9)
 
 
 var/const/MEDSCI			=(1<<1)
@@ -24,6 +23,8 @@ var/const/DOCTOR			=(1<<4)
 var/const/GENETICIST		=(1<<5)
 var/const/VIROLOGIST		=(1<<6)
 var/const/PSYCHIATRIST		=(1<<7)
+var/const/ROBOTICIST		=(1<<8)
+var/const/XENOBIOLOGIST		=(1<<9)
 
 
 var/const/CIVILIAN			=(1<<2)
@@ -78,7 +79,8 @@ var/list/science_positions = list(
 	"Research Director",
 	"Scientist",
 	"Geneticist",	//Part of both medical and science
-	"Roboticist"
+	"Roboticist",
+	"Xenobiologist"
 )
 
 //BS12 EDIT
@@ -115,3 +117,26 @@ var/list/nonhuman_positions = list(
 
 /proc/guest_jobbans(var/job)
 	return ((job in command_positions) || (job in nonhuman_positions) || (job in security_positions))
+
+/proc/get_job_datums()
+	var/list/occupations = list()
+	var/list/all_jobs = typesof(/datum/job)
+
+	for(var/A in all_jobs)
+		var/datum/job/job = new A()
+		if(!job)	continue
+		occupations += job
+
+	return occupations
+
+/proc/get_alternate_titles(var/job)
+	var/list/jobs = get_job_datums()
+	var/list/titles = list()
+
+	for(var/datum/job/J in jobs)
+		if(!J)	continue
+		if(J.title == job)
+			titles = J.alt_titles
+
+	return titles
+

code/game/machinery/adv_med.dm

@@ -284,10 +284,10 @@
 						var/internal_bleeding = ""
 						var/lung_ruptured = ""
 						for(var/datum/wound/W in e.wounds) if(W.internal)
-							internal_bleeding = "<br>Internal Bleeding"
+							internal_bleeding = "<br>Internal bleeding"
 							break
 						if(istype(e, /datum/organ/external/chest) && occupant.is_lung_ruptured())
-							lung_ruptured = "Lung Ruptured:"
+							lung_ruptured = "Lung ruptured:"
 						if(e.status & ORGAN_SPLINTED)
 							splint = "Splinted:"
 						if(e.status & ORGAN_BLEEDING)
@@ -297,7 +297,7 @@
 						if(e.open)
 							open = "Open:"
 						if(e.implants.len)
-							imp = "Implanted:"
+							imp = "Unknown body present:"
 						if(!AN && !open && !infected & !imp)
 							AN = "None:"
 						if(!(e.status & ORGAN_DESTROYED))

code/game/machinery/alarm.dm

@@ -48,7 +48,10 @@
 #define RCON_YES	3
 
 //1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
-#define MAX_ENERGY_CHANGE 2000
+#define MAX_ENERGY_CHANGE 1000
+
+#define MAX_TEMPERATURE 90
+#define MIN_TEMPERATURE -40
 
 //all air alarms in area are connected via magic
 /area
@@ -85,6 +88,7 @@
 	var/area_uid
 	var/area/alarm_area
 	var/danger_level = 0
+	var/buildstage = 2 //2 is built, 1 is building, 0 is frame.
 
 	var/target_temperature = T0C+20
 	var/regulating_temperature = 0
@@ -104,8 +108,26 @@
 		TLV["temperature"] =	list(20, 40, 140, 160) // K
 		target_temperature = 90
 
-	New()
+	New(var/loc, var/dir, var/building = 0)
 		..()
+
+		if(building)
+			if(loc)
+				src.loc = loc
+
+			if(dir)
+				src.dir = dir
+
+			buildstage = 0
+			wiresexposed = 1
+			pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
+			pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
+			update_icon()
+			return
+
+		first_run()
+
+	proc/first_run()
 		alarm_area = get_area(src)
 		if (alarm_area.master)
 			alarm_area = alarm_area.master
@@ -128,7 +150,7 @@
 
 
 	process()
-		if((stat & (NOPOWER|BROKEN)) || shorted)
+		if((stat & (NOPOWER|BROKEN)) || shorted || buildstage != 2)
 			return
 
 		var/turf/simulated/location = loc
@@ -137,18 +159,21 @@
 		var/datum/gas_mixture/environment = location.return_air()
 
 		//Handle temperature adjustment here.
-		if(environment.temperature < target_temperature - 10 || environment.temperature > target_temperature + 10 || regulating_temperature)
+		if(environment.temperature < target_temperature - 2 || environment.temperature > target_temperature + 2 || regulating_temperature)
 			//If it goes too far, we should adjust ourselves back before stopping.
+			if(get_danger_level(target_temperature, TLV["temperature"]))
+				return
+
 			if(!regulating_temperature)
 				regulating_temperature = 1
 				visible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
 				"You hear a click and a faint electronic hum.")
 
-			if(target_temperature > T0C + 90)
-				target_temperature = T0C + 90
+			if(target_temperature > T0C + MAX_TEMPERATURE)
+				target_temperature = T0C + MAX_TEMPERATURE
 
-			if(target_temperature < T0C - 40)
-				target_temperature = T0C - 40
+			if(target_temperature < T0C + MIN_TEMPERATURE)
+				target_temperature = T0C + MIN_TEMPERATURE
 
 			var/datum/gas_mixture/gas = location.remove_air(0.25*environment.total_moles)
 			var/heat_capacity = gas.heat_capacity()
@@ -480,6 +505,14 @@
 		var/wireFlag = AAlarmIndexToFlag[wireIndex]
 		return ((AAlarmwires & wireFlag) == 0)
 
+	proc/allWiresCut()
+		var/i = 1
+		while(i<=5)
+			if(AAlarmwires & AAlarmIndexToFlag[i])
+				return 0
+			i++
+		return 1
+
 	proc/cut(var/wireColor)
 		var/wireFlag = AAlarmWireColorToFlag[wireColor]
 		var/wireIndex = AAlarmWireColorToIndex[wireColor]
@@ -603,6 +636,9 @@
 	interact(mob/user)
 		user.set_machine(src)
 
+		if(buildstage!=2)
+			return
+
 		if ( (get_dist(src, user) > 1 ))
 			if (!istype(user, /mob/living/silicon))
 				user.machine = null
@@ -709,7 +745,7 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 		else if (other_dangerlevel==1)
 			output += "Notice: <span class='dl1'>Low Concentration of Unknown Particles Detected</span><br>"
 
-		output += "Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]</span>K<br>"
+		output += "Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]</span>K ([round(environment.temperature - T0C, 0.1)]C)<br>"
 
 		//Overall status
 		output += "Local Status: "
@@ -727,7 +763,7 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 		return output
 
 	proc/rcon_text()
-		var/dat = "<b>Remote Control:</b><br>"
+		var/dat = "<table width=\"100%\"><td align=\"center\"><b>Remote Control:</b><br>"
 		if(rcon_setting == RCON_NO)
 			dat += "<b>Off</b>"
 		else
@@ -741,7 +777,11 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 		if(rcon_setting == RCON_YES)
 			dat += "<b>On</b>"
 		else
-			dat += "<a href='?src=\ref[src];rcon=[RCON_YES]'>On</a>"
+			dat += "<a href='?src=\ref[src];rcon=[RCON_YES]'>On</a></td>"
+
+		//Hackish, I know.  I didn't feel like bothering to rework all of this.
+		dat += "<td align=\"center\"><b>Thermostat:</b><br><a href='?src=\ref[src];temperature=1'>[target_temperature - T0C]C</a></td></table>"
+
 		return dat
 
 	proc/return_controls()
@@ -985,10 +1025,6 @@ table tr:first-child th:first-child { border: none;}
 						if(selected[3] > selected[4])
 							selected[3] = selected[4]
 
-					//Sets the temperature the built-in heater/cooler tries to maintain.
-					if(env == "temperature")
-						target_temperature = (selected[2] + selected[3])/2
-
 					apply_mode()
 
 		if(href_list["screen"])
@@ -1015,6 +1051,16 @@ table tr:first-child th:first-child { border: none;}
 			mode = text2num(href_list["mode"])
 			apply_mode()
 
+		if(href_list["temperature"])
+			var/list/selected = TLV["temperature"]
+			var/max_temperature = min(selected[3] - T0C, MAX_TEMPERATURE)
+			var/min_temperature = max(selected[2] - T0C, MIN_TEMPERATURE)
+			var/input_temperature = input("What temperature would you like the system to mantain? (Capped between [min_temperature]C and [max_temperature]C)", "Thermostat Controls") as num|null
+			if(!input_temperature || input_temperature > max_temperature || input_temperature < min_temperature)
+				usr << "Temperature must be between [min_temperature]C and [max_temperature]C"
+			else
+				target_temperature = input_temperature + T0C
+
 		if (href_list["AAlarmwires"])
 			var/t1 = text2num(href_list["AAlarmwires"])
 			if (!( istype(usr.equipped(), /obj/item/weapon/wirecutters) ))
@@ -1048,28 +1094,74 @@ table tr:first-child th:first-child { border: none;}
 		update_icon()
 		return
 */
-	if(istype(W, /obj/item/weapon/screwdriver))  // Opening that Air Alarm up.
-		//user << "You pop the Air Alarm's maintence panel open."
-		wiresexposed = !wiresexposed
-		user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
-		update_icon()
-		return
+	src.add_fingerprint(user)
 
-	if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters))))
-		return attack_hand(user)
+	switch(buildstage)
+		if(2)
+			if(istype(W, /obj/item/weapon/screwdriver))  // Opening that Air Alarm up.
+				//user << "You pop the Air Alarm's maintence panel open."
+				wiresexposed = !wiresexposed
+				user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
+				update_icon()
+				return
 
+			if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters))))
+				return attack_hand(user)
+
+			if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
+				if(stat & (NOPOWER|BROKEN))
+					user << "It does nothing"
+					return
+				else
+					if(allowed(usr) && !isWireCut(AALARM_WIRE_IDSCAN))
+						locked = !locked
+						user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface."
+						updateUsrDialog()
+					else
+						user << "\red Access denied."
+			return
+
+		if(1)
+			if(istype(W, /obj/item/weapon/cable_coil))
+				var/obj/item/weapon/cable_coil/coil = W
+				if(coil.amount < 5)
+					user << "You need more cable for this!"
+					return
+
+				user << "You wire \the [src]!"
+				coil.amount -= 5
+				if(!coil.amount)
+					del(coil)
+
+				buildstage = 2
+				update_icon()
+				first_run()
+
+			else if(istype(W, /obj/item/weapon/crowbar))
+				user << "You pry out the circuit!"
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				spawn(20)
+					var/obj/item/weapon/airalarm_electronics/circuit = new /obj/item/weapon/airalarm_electronics()
+					circuit.loc = user.loc
+					buildstage = 0
+					update_icon()
+			return
+		if(0)
+			if(istype(W, /obj/item/weapon/airalarm_electronics))
+				user << "You insert the circuit!"
+				del(W)
+				buildstage = 1
+				update_icon()
+
+				/* Commented out due to RUNTIMES, RUNTIMES EVERYWHERE.
+				else if(istype(W, /obj/item/weapon/wrench))
+					user << "You remove the fire alarm assembly from the wall!"
+					var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame()
+					frame.loc = user.loc
+					playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+					del(src) */
+			return
 
-	else if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
-		if(stat & (NOPOWER|BROKEN))
-			user << "It does nothing"
-		else
-			if(allowed(usr) && !isWireCut(AALARM_WIRE_IDSCAN))
-				locked = !locked
-				user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface."
-				updateUsrDialog()
-			else
-				user << "\red Access denied."
-		return
 	return ..()
 
 /obj/machinery/alarm/power_change()
@@ -1218,15 +1310,6 @@ FIRE ALARM
 						user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.")
 					else
 						user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.")
-
-				else if (istype(W, /obj/item/weapon/wirecutters))
-					buildstage = 1
-					playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
-					var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil()
-					coil.amount = 5
-					coil.loc = user.loc
-					user << "You cut the wires from \the [src]"
-					update_icon()
 			if(1)
 				if(istype(W, /obj/item/weapon/cable_coil))
 					var/obj/item/weapon/cable_coil/coil = W

code/game/machinery/bees.dm

@@ -10,7 +10,7 @@
 	var/turf/target_turf
 	var/mob/target_mob
 	var/obj/machinery/apiary/parent
-	pass_flags = PASSGRILLE|PASSTABLE
+	pass_flags = PASSTABLE
 	turns_per_move = 6
 	var/obj/machinery/hydroponics/my_hydrotray
 
@@ -29,21 +29,19 @@
 
 	if(stat == CONSCIOUS)
 		//if we're strong enough, sting some people
-		var/overrun = strength - 5 + feral / 2
-		if(prob(max( overrun * 10 + feral * 10, 0)))
-			var/mob/living/carbon/human/M = pick(range(1,src))
-			if(M)
-				var/sting_prob = 100
+		var/mob/living/carbon/human/M = target_mob
+		var/sting_prob = 100 // Bees will always try to sting.
+		if(M in view(src,1)) // Can I see my target?
+			if(prob(max(feral * 10, 0)))	// Am I mad enough to want to sting? And yes, when I initially appear, I AM mad enough
 				var/obj/item/clothing/worn_suit = M.wear_suit
 				var/obj/item/clothing/worn_helmet = M.head
-				if(worn_suit)
-					sting_prob -= worn_suit.armor["bio"]
+				if(worn_suit) // Are you wearing clothes?
+					sting_prob -= min(worn_suit.armor["bio"],70) // Is it sealed? I can't get to 70% of your body.
 				if(worn_helmet)
-					sting_prob -= worn_helmet.armor["bio"]
-
-				if( prob(sting_prob) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25))) )
-					M.apply_damage(overrun / 2 + mut / 2, BRUTE)
-					M.apply_damage(overrun / 2 + toxic / 2, TOX)
+					sting_prob -= min(worn_helmet.armor["bio"],30) // Is your helmet sealed? I can't get to 30% of your body.
+				if( prob(sting_prob) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25))) ) // Try to sting! If you're not moving, think about stinging.
+					M.apply_damage(min(strength,2)+mut, BRUTE) // Stinging. The more mutated I am, the harder I sting.
+					M.apply_damage((round(feral/5,1)*(max((round(strength/10,1)),1)))+toxic, TOX) // Bee venom based on how angry I am and how many there are of me!
 					M << "\red You have been stung!"
 					M.flash_pain()
 
@@ -134,14 +132,17 @@
 			if(target_mob in view(src,7))
 				target_turf = get_turf(target_mob)
 				wander = 0
-			else
-				for(var/mob/living/carbon/M in view(src,7))
-					target_mob = M
+
+			else // My target's gone! But I might still be pissed! You there. You look like a good stinging target!
+				for(var/mob/living/carbon/G in view(src,7))
+					target_mob = G
 					break
 
 	if(target_turf)
-		Move(get_step(src, get_dir(src,target_turf)))
-
+		if (!(DirBlocked(get_step(src, get_dir(src,target_turf)),get_dir(src,target_turf)))) // Check for windows and doors!
+			Move(get_step(src, get_dir(src,target_turf)))
+			if (prob(0.1))
+				src.visible_message("\blue The bees swarm after [target_mob]!")
 		if(src.loc == target_turf)
 			target_turf = null
 			wander = 1

code/game/machinery/bees_apiary.dm

@@ -87,7 +87,7 @@
 		if(harvestable_honey > 0)
 			if(health > 0)
 				user << "\red You begin to harvest the honey. The bees don't seem to like it."
-				angry_swarm()
+				angry_swarm(user)
 			else
 				user << "\blue You begin to harvest the honey."
 			if(do_after(user,50))
@@ -97,7 +97,7 @@
 		else
 			user << "\blue There is no honey left to harvest."
 	else
-		angry_swarm()
+		angry_swarm(user)
 		..()
 
 /obj/machinery/apiary/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -171,16 +171,19 @@
 		//find some plants, harvest
 		for(var/obj/machinery/hydroponics/H in view(7, src))
 			if(H.planted && !H.dead && H.myseed && prob(owned_bee_swarms.len * 10))
+				src.nutrilevel++
+				H.nutrilevel++
 				if(mut < H.mutmod - 1)
 					mut = H.mutmod - 1
 				else if(mut > H.mutmod - 1)
 					H.mutmod = mut
 
 				//flowers give us pollen (nutrients)
+/* - All plants should be giving nutrients to the hive.
 				if(H.myseed.type == /obj/item/seeds/harebell || H.myseed.type == /obj/item/seeds/sunflowerseed)
 					src.nutrilevel++
 					H.nutrilevel++
-
+*/
 				//have a few beneficial effects on nearby plants
 				if(prob(10))
 					H.lastcycle -= 5
@@ -206,7 +209,7 @@
 
 /obj/machinery/apiary/proc/angry_swarm(var/mob/M)
 	for(var/mob/living/simple_animal/bee/B in owned_bee_swarms)
-		B.feral = 50
+		B.feral = 25
 		B.target_mob = M
 
 	swarming = 25
@@ -219,7 +222,7 @@
 		var/mob/living/simple_animal/bee/B = new(get_turf(src), src)
 		B.target_mob = M
 		B.strength = spawn_strength
-		B.feral = 5
+		B.feral = 25
 		B.mut = mut
 		B.toxic = toxic
 		bees_in_hive -= spawn_strength

code/game/machinery/computer/medical.dm

@@ -145,12 +145,19 @@
 			src.active1 = null
 			src.active2 = null
 		else if (href_list["login"])
-			if (istype(usr, /mob/living/silicon))
+			if (istype(usr, /mob/living/silicon/ai))
 				src.active1 = null
 				src.active2 = null
-				src.authenticated = 1
+				src.authenticated = usr.name
 				src.rank = "AI"
 				src.screen = 1
+			else if (istype(usr, /mob/living/silicon/robot))
+				src.active1 = null
+				src.active2 = null
+				src.authenticated = usr.name
+				var/mob/living/silicon/robot/R = usr
+				src.rank = R.braintype
+				src.screen = 1
 			else if (istype(src.scan, /obj/item/weapon/card/id))
 				src.active1 = null
 				src.active2 = null
@@ -388,7 +395,7 @@
 				var/counter = 1
 				while(src.active2.fields[text("com_[]", counter)])
 					counter++
-				src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", src.authenticated, src.rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+				src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
 
 			if (href_list["del_c"])
 				if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))

code/game/machinery/computer/security.dm

@@ -245,12 +245,19 @@ What a mess.*/
 				active2 = null
 
 			if("Log In")
-				if (istype(usr, /mob/living/silicon))
-					active1 = null
-					active2 = null
-					authenticated = 1
-					rank = "AI"
-					screen = 1
+				if (istype(usr, /mob/living/silicon/ai))
+					src.active1 = null
+					src.active2 = null
+					src.authenticated = usr.name
+					src.rank = "AI"
+					src.screen = 1
+				else if (istype(usr, /mob/living/silicon/robot))
+					src.active1 = null
+					src.active2 = null
+					src.authenticated = usr.name
+					var/mob/living/silicon/robot/R = usr
+					src.rank = R.braintype
+					src.screen = 1
 				else if (istype(scan, /obj/item/weapon/card/id))
 					active1 = null
 					active2 = null
@@ -362,7 +369,7 @@ What a mess.*/
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
-				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", authenticated, rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+				active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
 
 			if ("Delete Record (ALL)")
 				if (active1)

code/game/machinery/computer/specops_shuttle.dm

@@ -262,9 +262,10 @@ var/specops_shuttle_timeleft = 0
 		user << "\red Access Denied."
 		return
 
-	if (sent_strike_team == 0 && send_emergency_team == 0)
-		usr << "\red The strike team has not yet deployed."
-		return
+//Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle.
+//	if (sent_strike_team == 0 && send_emergency_team == 0)
+//		usr << "\red The strike team has not yet deployed."
+//		return
 
 	if(..())
 		return

code/game/machinery/doors/airlock.dm

@@ -86,7 +86,8 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	var/list/signalers[12]
 	var/lockdownbyai = 0
 	autoclose = 1
-	var/doortype = 0
+	var/assembly_type = /obj/structure/door_assembly
+	var/mineral = null
 	var/justzap = 0
 	var/safe = 1
 	normalspeed = 1
@@ -96,143 +97,116 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 /obj/machinery/door/airlock/command
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorcom.dmi'
-	doortype = 1
+	assembly_type = /obj/structure/door_assembly/door_assembly_com
 
 /obj/machinery/door/airlock/security
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorsec.dmi'
-	doortype = 2
+	assembly_type = /obj/structure/door_assembly/door_assembly_sec
 
 /obj/machinery/door/airlock/engineering
 	name = "Airlock"
 	icon = 'icons/obj/doors/Dooreng.dmi'
-	doortype = 3
+	assembly_type = /obj/structure/door_assembly/door_assembly_eng
 
 /obj/machinery/door/airlock/medical
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doormed.dmi'
-	doortype = 4
+	assembly_type = /obj/structure/door_assembly/door_assembly_med
 
 /obj/machinery/door/airlock/maintenance
 	name = "Maintenance Access"
 	icon = 'icons/obj/doors/Doormaint.dmi'
-	doortype = 5
+	assembly_type = /obj/structure/door_assembly/door_assembly_mai
 
 /obj/machinery/door/airlock/external
 	name = "External Airlock"
 	icon = 'icons/obj/doors/Doorext.dmi'
-	doortype = 6
+	assembly_type = /obj/structure/door_assembly/door_assembly_ext
 
 /obj/machinery/door/airlock/glass
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Doorglass.dmi'
 	opacity = 0
-	doortype = 7
 	glass = 1
 
 /obj/machinery/door/airlock/centcom
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorele.dmi'
 	opacity = 0
-	doortype = 8
 
 /obj/machinery/door/airlock/vault
 	name = "Vault"
 	icon = 'icons/obj/doors/vault.dmi'
 	opacity = 1
-	doortype = 9
-
-/obj/machinery/door/airlock/glass_large
-	name = "Glass Airlock"
-	icon = 'icons/obj/doors/Door2x1glassfull.dmi'
-	opacity = 0
-	doortype = 10
-	bound_width = 64
-	glass = 1
-
-	update_nearby_tiles(need_rebuild)
-		. = ..()
-
-		if(!.)
-			return
-
-		var/turf/simulated/second_turf = get_step(src, EAST)
-		var/turf/simulated/north = get_step(second_turf, NORTH)
-		var/turf/simulated/east = get_step(second_turf, EAST)
-		var/turf/simulated/south = get_step(second_turf, SOUTH)
-
-		update_heat_protection(second_turf)
-
-		if(istype(north)) air_master.tiles_to_update |= north
-		if(istype(south)) air_master.tiles_to_update |= south
-		if(istype(east)) air_master.tiles_to_update |= east
+	assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites.
 
 /obj/machinery/door/airlock/freezer
 	name = "Freezer Airlock"
 	icon = 'icons/obj/doors/Doorfreezer.dmi'
 	opacity = 1
-	doortype = 11
+	assembly_type = /obj/structure/door_assembly/door_assembly_fre
 
 /obj/machinery/door/airlock/hatch
 	name = "Airtight Hatch"
 	icon = 'icons/obj/doors/Doorhatchele.dmi'
 	opacity = 1
-	doortype = 12
+	assembly_type = /obj/structure/door_assembly/door_assembly_hatch
 
 /obj/machinery/door/airlock/maintenance_hatch
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorhatchmaint2.dmi'
 	opacity = 1
-	doortype = 13
+	assembly_type = /obj/structure/door_assembly/door_assembly_mhatch
 
 /obj/machinery/door/airlock/glass_command
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorcomglass.dmi'
 	opacity = 0
-	doortype = 14
+	assembly_type = /obj/structure/door_assembly/door_assembly_com
 	glass = 1
 
 /obj/machinery/door/airlock/glass_engineering
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorengglass.dmi'
 	opacity = 0
-	doortype = 15
+	assembly_type = /obj/structure/door_assembly/door_assembly_eng
 	glass = 1
 
 /obj/machinery/door/airlock/glass_security
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorsecglass.dmi'
 	opacity = 0
-	doortype = 16
+	assembly_type = /obj/structure/door_assembly/door_assembly_sec
 	glass = 1
 
 /obj/machinery/door/airlock/glass_medical
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doormedglass.dmi'
 	opacity = 0
-	doortype = 17
+	assembly_type = /obj/structure/door_assembly/door_assembly_med
 	glass = 1
 
 /obj/machinery/door/airlock/mining
 	name = "Mining Airlock"
 	icon = 'icons/obj/doors/Doormining.dmi'
-	doortype = 18
+	assembly_type = /obj/structure/door_assembly/door_assembly_min
 
 /obj/machinery/door/airlock/atmos
 	name = "Atmospherics Airlock"
 	icon = 'icons/obj/doors/Dooratmo.dmi'
-	doortype = 19
+	assembly_type = /obj/structure/door_assembly/door_assembly_atmo
 
 /obj/machinery/door/airlock/research
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorresearch.dmi'
-	doortype = 20
+	assembly_type = /obj/structure/door_assembly/door_assembly_research
 
 /obj/machinery/door/airlock/glass_research
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorresearchglass.dmi'
 	opacity = 0
-	doortype = 21
+	assembly_type = /obj/structure/door_assembly/door_assembly_research
 	glass = 1
 	heat_proof = 1
 
@@ -240,40 +214,36 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorminingglass.dmi'
 	opacity = 0
-	doortype = 22
+	assembly_type = /obj/structure/door_assembly/door_assembly_min
 	glass = 1
 
 /obj/machinery/door/airlock/glass_atmos
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Dooratmoglass.dmi'
 	opacity = 0
-	doortype = 23
+	assembly_type = /obj/structure/door_assembly/door_assembly_atmo
 	glass = 1
 
 /obj/machinery/door/airlock/gold
 	name = "Gold Airlock"
 	icon = 'icons/obj/doors/Doorgold.dmi'
-	var/mineral = "gold"
-	doortype = 24
+	mineral = "gold"
 
 /obj/machinery/door/airlock/silver
 	name = "Silver Airlock"
 	icon = 'icons/obj/doors/Doorsilver.dmi'
-	var/mineral = "silver"
-	doortype = 25
+	mineral = "silver"
 
 /obj/machinery/door/airlock/diamond
 	name = "Diamond Airlock"
 	icon = 'icons/obj/doors/Doordiamond.dmi'
-	var/mineral = "diamond"
-	doortype = 26
+	mineral = "diamond"
 
 /obj/machinery/door/airlock/uranium
 	name = "Uranium Airlock"
 	desc = "And they said I was crazy."
 	icon = 'icons/obj/doors/Dooruranium.dmi'
-	var/mineral = "uranium"
-	doortype = 27
+	mineral = "uranium"
 	var/last_event = 0
 
 /obj/machinery/door/airlock/uranium/process()
@@ -292,8 +262,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	name = "Plasma Airlock"
 	desc = "No way this can end badly."
 	icon = 'icons/obj/doors/Doorplasma.dmi'
-	var/mineral = "plasma"
-	doortype = 28
+	mineral = "plasma"
 
 /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
@@ -321,37 +290,35 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 		W.ignite((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame
 	for(var/obj/machinery/door/airlock/plasma/D in range(3,src))
 		D.ignite(temperature/4)
-	new/obj/structure/door_assembly/door_assembly_0( src.loc )
+	new/obj/structure/door_assembly( src.loc )
 	del (src)
 
 /obj/machinery/door/airlock/clown
 	name = "Bananium Airlock"
 	icon = 'icons/obj/doors/Doorbananium.dmi'
-	var/mineral = "clown"
-	doortype = 29
+	mineral = "clown"
 
 /obj/machinery/door/airlock/sandstone
 	name = "Sandstone Airlock"
 	icon = 'icons/obj/doors/Doorsand.dmi'
-	var/mineral = "sandstone"
-	doortype = 30
+	mineral = "sandstone"
 
 /obj/machinery/door/airlock/science
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorsci.dmi'
-	doortype = 31
+	assembly_type = /obj/structure/door_assembly/door_assembly_science
 
 /obj/machinery/door/airlock/glass_science
 	name = "Glass Airlocks"
 	icon = 'icons/obj/doors/Doorsciglass.dmi'
 	opacity = 0
-	doortype = 32
+	assembly_type = /obj/structure/door_assembly/door_assembly_science
 	glass = 1
 
 /obj/machinery/door/airlock/highsecurity
 	name = "High Tech Security Airlock"
 	icon = 'icons/obj/doors/hightechsecurity.dmi'
-	doortype = 33
+	assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity
 
 /*
 About the new airlock wires panel:
@@ -1221,42 +1188,26 @@ About the new airlock wires panel:
 			user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
 			if(do_after(user,40))
 				user << "\blue You removed the airlock electronics!"
-				switch(src.doortype)
-					if(0) new/obj/structure/door_assembly/door_assembly_0( src.loc )
-					if(1) new/obj/structure/door_assembly/door_assembly_com( src.loc )
-					if(2) new/obj/structure/door_assembly/door_assembly_sec( src.loc )
-					if(3) new/obj/structure/door_assembly/door_assembly_eng( src.loc )
-					if(4) new/obj/structure/door_assembly/door_assembly_med( src.loc )
-					if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc )
-					if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
-					if(7) new/obj/structure/door_assembly/door_assembly_glass( src.loc )
-					if(12) new/obj/structure/door_assembly/door_assembly_hatch( src.loc )
-					if(13) new/obj/structure/door_assembly/door_assembly_mhatch( src.loc )
-					if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc )
-					if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc )
-					if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )
-					if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc )
-					if(18) new/obj/structure/door_assembly/door_assembly_min( src.loc )
-					if(19) new/obj/structure/door_assembly/door_assembly_atmo( src.loc )
-					if(20) new/obj/structure/door_assembly/door_assembly_research( src.loc )
-					if(21) new/obj/structure/door_assembly/door_assembly_research/glass( src.loc )
-					if(22) new/obj/structure/door_assembly/door_assembly_min/glass( src.loc )
-					if(23) new/obj/structure/door_assembly/door_assembly_atmo/glass( src.loc )
-					if(24) new/obj/structure/door_assembly/door_assembly_gold( src.loc )
-					if(25) new/obj/structure/door_assembly/door_assembly_silver( src.loc )
-					if(26) new/obj/structure/door_assembly/door_assembly_diamond( src.loc )
-					if(27) new/obj/structure/door_assembly/door_assembly_uranium( src.loc )
-					if(28) new/obj/structure/door_assembly/door_assembly_plasma( src.loc )
-					if(29) new/obj/structure/door_assembly/door_assembly_clown( src.loc )
-					if(30) new/obj/structure/door_assembly/door_assembly_sandstone( src.loc )
-					if(31) new/obj/structure/door_assembly/door_assembly_science( src.loc )
-					if(32) new/obj/structure/door_assembly/door_assembly_science/glass( src.loc )
-					if(33) new/obj/structure/door_assembly/door_assembly_highsecurity(src.loc)
+
+				var/obj/structure/door_assembly/da = new assembly_type(src.loc)
+				da.anchored = 1
+				if(mineral)
+					da.glass = mineral
+				//else if(glass)
+				else if(glass && !da.glass)
+					da.glass = 1
+				da.state = 1
+				da.created_name = src.name
+				da.update_state()
 
 				var/obj/item/weapon/airlock_electronics/ae
 				if(!electronics)
 					ae = new/obj/item/weapon/airlock_electronics( src.loc )
-					ae.conf_access = src.req_access
+					if(src.req_access.len)
+						ae.conf_access = src.req_access
+					else if (src.req_one_access.len)
+						ae.conf_access = src.req_one_access
+						ae.one_access = 1
 				else
 					ae = electronics
 					electronics = null
@@ -1342,7 +1293,7 @@ About the new airlock wires panel:
 				var/obj/effect/stop/S
 				S = new /obj/effect/stop
 				S.victim = M
-				S.loc = src.loc
+				S.loc = M.loc
 				spawn(20)
 					del(S)
 				M.emote("scream")

code/game/machinery/doors/airlock_electronics.dm

@@ -11,6 +11,7 @@
 	req_access = list(access_engine)
 
 	var/list/conf_access = null
+	var/one_access = 0 //if set to 1, door would receive req_one_access instead of req_access
 	var/last_configurator = null
 	var/locked = 1
 
@@ -33,6 +34,8 @@
 		else
 			t1 += "<a href='?src=\ref[src];logout=1'>Block</a><hr>"
 
+			t1 += "Access requirement is set to "
+			t1 += one_access ? "<a style='color: green' href='?src=\ref[src];one_access=1'>ONE</a><hr>" : "<a style='color: red' href='?src=\ref[src];one_access=1'>ALL</a><hr>"
 
 			t1 += conf_access == null ? "<font color=red>All</font><br>" : "<a href='?src=\ref[src];access=all'>All</a><br>"
 
@@ -44,6 +47,8 @@
 
 				if (!conf_access || !conf_access.len || !(acc in conf_access))
 					t1 += "<a href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
+				else if(one_access)
+					t1 += "<a style='color: green' href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
 				else
 					t1 += "<a style='color: red' href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
 
@@ -75,6 +80,9 @@
 		if (href_list["logout"])
 			locked = 1
 
+		if (href_list["one_access"])
+			one_access = !one_access
+
 		if (href_list["access"])
 			toggle_access(href_list["access"])
 

code/game/machinery/doors/alarmlock.dm

@@ -3,7 +3,6 @@
 	name = "Glass Alarm Airlock"
 	icon = 'icons/obj/doors/Doorglass.dmi'
 	opacity = 0
-	doortype = 7
 	glass = 1
 
 	var/datum/radio_frequency/air_connection

code/game/machinery/doors/door.dm

@@ -20,8 +20,12 @@
 	var/heat_proof = 0 // For glass airlocks/opacity firedoors
 	var/air_properties_vary_with_direction = 0
 
+	//Multi-tile doors
+	dir = EAST
+	var/width = 1
+
 /obj/machinery/door/New()
-	..()
+	. = ..()
 	if(density)
 		layer = 3.1 //Above most items if closed
 		explosion_resistance = initial(explosion_resistance)
@@ -29,6 +33,16 @@
 	else
 		layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6
 		explosion_resistance = 0
+
+
+	if(width > 1)
+		if(dir in list(EAST, WEST))
+			bound_width = width * world.icon_size
+			bound_height = world.icon_size
+		else
+			bound_width = world.icon_size
+			bound_height = width * world.icon_size
+
 	update_nearby_tiles(need_rebuild=1)
 	return
 
@@ -258,6 +272,22 @@
 	if(istype(south)) air_master.tiles_to_update += south
 	if(istype(east)) air_master.tiles_to_update += east
 	if(istype(west)) air_master.tiles_to_update += west
+
+	if(width > 1)
+		var/turf/simulated/next_turf = src
+		var/step_dir = turn(dir, 180)
+		for(var/current_step = 2, current_step <= width, current_step++)
+			next_turf = get_step(src, step_dir)
+			north = get_step(next_turf, step_dir)
+			east = get_step(next_turf, turn(step_dir, 90))
+			south = get_step(next_turf, turn(step_dir, -90))
+
+			update_heat_protection(next_turf)
+
+			if(istype(north)) air_master.tiles_to_update |= north
+			if(istype(south)) air_master.tiles_to_update |= south
+			if(istype(east)) air_master.tiles_to_update |= east
+
 	return 1
 
 /obj/machinery/door/proc/update_heat_protection(var/turf/simulated/source)
@@ -273,5 +303,18 @@
 		close()
 	return
 
+/obj/machinery/door/Move(new_loc, new_dir)
+	update_nearby_tiles()
+	. = ..()
+	if(width > 1)
+		if(dir in list(EAST, WEST))
+			bound_width = width * world.icon_size
+			bound_height = world.icon_size
+		else
+			bound_width = world.icon_size
+			bound_height = width * world.icon_size
+
+	update_nearby_tiles()
+
 /obj/machinery/door/morgue
 	icon = 'icons/obj/doors/doormorgue.dmi'

code/game/machinery/doors/firedoor.dm

@@ -276,21 +276,4 @@
 
 /obj/machinery/door/firedoor/multi_tile
 	icon = 'DoorHazard2x1.dmi'
-	bound_width = 64
-
-
-	update_nearby_tiles(need_rebuild)
-		if(!.)
-			return
-
-		. = ..()
-		var/turf/simulated/second_turf = get_step(src, EAST)
-		var/turf/simulated/north = get_step(second_turf, NORTH)
-		var/turf/simulated/east = get_step(second_turf, EAST)
-		var/turf/simulated/south = get_step(second_turf, SOUTH)
-
-		update_heat_protection(second_turf)
-
-		if(istype(north)) air_master.tiles_to_update |= north
-		if(istype(south)) air_master.tiles_to_update |= south
-		if(istype(east)) air_master.tiles_to_update |= east
+	width = 2

code/game/machinery/doors/multi_tile.dm

@@ -0,0 +1,10 @@
+//Terribly sorry for the code doubling, but things go derpy otherwise.
+/obj/machinery/door/airlock/multi_tile
+	width = 2
+
+/obj/machinery/door/airlock/multi_tile/glass
+	name = "Glass Airlock"
+	icon = 'icons/obj/doors/Door2x1glass.dmi'
+	opacity = 0
+	glass = 1
+	assembly_type = "obj/structure/door_assembly/multi_tile"

code/game/machinery/doors/windowdoor.dm

@@ -130,6 +130,21 @@
 		new /obj/item/weapon/shard(src.loc)
 		var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc)
 		CC.amount = 2
+		var/obj/item/weapon/airlock_electronics/ae
+		if(!electronics)
+			ae = new/obj/item/weapon/airlock_electronics( src.loc )
+			if(src.req_access.len)
+				ae.conf_access = src.req_access
+			else if (src.req_one_access.len)
+				ae.conf_access = src.req_one_access
+				ae.one_access = 1
+		else
+			ae = electronics
+			electronics = null
+			ae.loc = src.loc
+		if(operating == -1)
+			ae.icon_state = "door_electronics_smoked"
+			operating = 0
 		src.density = 0
 		del(src)
 		return
@@ -162,15 +177,9 @@
 	if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult))
 		if(src.operating)
 			return
-		src.health = max(0, src.health - 25)
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		visible_message("\red <B>[user] smashes against the [src.name].</B>", 1)
-		if (src.health <= 0)
-			new /obj/item/weapon/shard(src.loc)
-			var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc)
-			CC.amount = 2
-			src.density = 0
-			del(src)
+		take_damage(25)
 	else
 		return src.attack_hand(user)
 
@@ -181,7 +190,7 @@
 /obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/user as mob)
 
 	//If it's in the process of opening/closing, ignore the click
-	if (src.operating)
+	if (src.operating == 1)
 		return
 
 	//Emags and ninja swords? You may pass.
@@ -199,19 +208,50 @@
 		open()
 		return 1
 
+	//If it's emagged, crowbar can pry electronics out.
+	if (src.operating == -1 && istype(I, /obj/item/weapon/crowbar))
+		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.")
+		if (do_after(user,40))
+			user << "\blue You removed the windoor electronics!"
+
+			var/obj/structure/windoor_assembly/wa = new/obj/structure/windoor_assembly(src.loc)
+			if (istype(src, /obj/machinery/door/window/brigdoor))
+				wa.secure = "secure_"
+				wa.name = "Secure Wired Windoor Assembly"
+			else
+				wa.name = "Wired Windoor Assembly"
+			if (src.base_state == "right" || src.base_state == "rightsecure")
+				wa.facing = "r"
+			wa.dir = src.dir
+			wa.state = "02"
+			wa.update_icon()
+
+			var/obj/item/weapon/airlock_electronics/ae
+			if(!electronics)
+				ae = new/obj/item/weapon/airlock_electronics( src.loc )
+				if(src.req_access.len)
+					ae.conf_access = src.req_access
+				else if (src.req_one_access.len)
+					ae.conf_access = src.req_one_access
+					ae.one_access = 1
+			else
+				ae = electronics
+				electronics = null
+				ae.loc = src.loc
+			ae.icon_state = "door_electronics_smoked"
+
+			operating = 0
+			del(src)
+			return
+
 	//If it's a weapon, smash windoor. Unless it's an id card, agent card, ect.. then ignore it (Cards really shouldnt damage a door anyway)
 	if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card))
 		var/aforce = I.force
-		if(I.damtype == BRUTE || I.damtype == BURN)
-			src.health = max(0, src.health - aforce)
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		visible_message("\red <B>[src] was hit by [I].</B>")
-		if (src.health <= 0)
-			new /obj/item/weapon/shard(src.loc)
-			var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc)
-			CC.amount = 2
-			src.density = 0
-			del(src)
+		if(I.damtype == BRUTE || I.damtype == BURN)
+			take_damage(aforce)
 		return
 
 

code/game/machinery/doppler_array.dm

@@ -6,10 +6,12 @@ var/list/doppler_arrays = list()
 
 
 /obj/machinery/doppler_array/New()
+	..()
 	doppler_arrays += src
 
 /obj/machinery/doppler_array/Del()
 	doppler_arrays -= src
+	..()
 
 /obj/machinery/doppler_array/process()
 	return PROCESS_KILL

code/game/machinery/machinery.dm

@@ -114,6 +114,7 @@ Class Procs:
 	machines += src
 
 /obj/machinery/Del()
+	machines -= src
 	..()
 
 /obj/machinery/process()//If you dont use process or power why are you here

code/game/machinery/requests_console.dm

@@ -69,6 +69,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			icon_state = "req_comp0"
 
 /obj/machinery/requests_console/New()
+	..()
 	name = "[department] Requests Console"
 	allConsoles += src
 	//req_console_departments += department

code/game/mecha/mech_fabricator.dm

@@ -23,7 +23,7 @@
 										"diamond"=0,
 										"plasma"=0,
 										"uranium"=0,
-										"bananium"=0
+										//"bananium"=0 No need to state what it can no longer hold
 										)
 	var/res_max_amount = 200000
 	var/datum/research/files
@@ -44,7 +44,12 @@
 						/obj/item/robot_parts/l_arm,
 						/obj/item/robot_parts/r_arm,
 						/obj/item/robot_parts/l_leg,
-						/obj/item/robot_parts/r_leg
+						/obj/item/robot_parts/r_leg,
+						/obj/item/robot_parts/robot_component/binary_communication_device,
+						/obj/item/robot_parts/robot_component/radio,
+						/obj/item/robot_parts/robot_component/actuator,
+						/obj/item/robot_parts/robot_component/diagnosis_unit,
+						/obj/item/robot_parts/robot_component/camera
 					),
 	"Ripley"=list(
 						/obj/item/mecha_parts/chassis/ripley,
@@ -84,7 +89,7 @@
 						/obj/item/mecha_parts/part/durand_right_leg,
 						/obj/item/mecha_parts/part/durand_armour
 					),
-	"H.O.N.K"=list(
+	/*"H.O.N.K"=list(
 						/obj/item/mecha_parts/chassis/honker,
 						/obj/item/mecha_parts/part/honker_torso,
 						/obj/item/mecha_parts/part/honker_head,
@@ -92,7 +97,7 @@
 						/obj/item/mecha_parts/part/honker_right_arm,
 						/obj/item/mecha_parts/part/honker_left_leg,
 						/obj/item/mecha_parts/part/honker_right_leg
-						),
+						), No need for HONK stuff*/
 	"Exosuit Equipment"=list(
 						/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,
 						/obj/item/mecha_parts/mecha_equipment/tool/drill,
@@ -106,9 +111,9 @@
 						///obj/item/mecha_parts/mecha_equipment/jetpack, //TODO MECHA JETPACK SPRITE MISSING
 						/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
 						/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg,
-						/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar,
-						/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar,
-						/obj/item/mecha_parts/mecha_equipment/weapon/honker
+						///obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar, HONK-related mech part
+						///obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar, Also HONK-related
+						///obj/item/mecha_parts/mecha_equipment/weapon/honker Thirdly HONK-related
 						),
 
 	"Robotic Upgrade Modules" = list(
@@ -675,8 +680,8 @@
 			type = /obj/item/stack/sheet/mineral/plasma
 		if("uranium")
 			type = /obj/item/stack/sheet/mineral/uranium
-		if("bananium")
-			type = /obj/item/stack/sheet/mineral/clown
+		/*if("bananium")
+			type = /obj/item/stack/sheet/mineral/clown Sorry, but no more clown mechs, even if you do manage to get to the clown planet.*/
 		else
 			return 0
 	var/result = 0
@@ -734,9 +739,9 @@
 			if(src.resources["diamond"] >= 2000)
 				var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
 				G.amount = round(src.resources["diamond"] / G.perunit)
-			if(src.resources["bananium"] >= 2000)
+			/*if(src.resources["bananium"] >= 2000)
 				var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc)
-				G.amount = round(src.resources["bananium"] / G.perunit)
+				G.amount = round(src.resources["bananium"] / G.perunit) Sorry, but no bananium allowed*/
 			del(src)
 			return 1
 		else
@@ -760,8 +765,8 @@
 			material = "metal"
 		if(/obj/item/stack/sheet/glass)
 			material = "glass"
-		if(/obj/item/stack/sheet/mineral/clown)
-			material = "bananium"
+		/*if(/obj/item/stack/sheet/mineral/clown)
+			material = "bananium"*/
 		if(/obj/item/stack/sheet/mineral/uranium)
 			material = "uranium"
 		else

code/game/mecha/mecha.dm

@@ -1574,6 +1574,9 @@
 		return
 	if(href_list["dna_lock"])
 		if(usr != src.occupant)	return
+		if(istype(src, /obj/item/device/mmi))
+			occupant_message("You are a brain. No.")
+			return
 		if(src.occupant)
 			src.dna = src.occupant.dna.unique_enzymes
 			src.occupant_message("You feel a prick as the needle takes your DNA sample.")

code/game/objects/effects/barsign.dm

@@ -4,5 +4,5 @@
 	anchored = 1
 
 	New()
-		var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead")
+		var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt")
 		src.icon_state = "[pick(valid_states)]"

code/game/objects/effects/landmarks.dm

@@ -69,6 +69,10 @@
 			xeno_spawn += loc
 			del(src)
 
+		if("ninjastart")
+			ninjastart += loc
+			del(src)
+
 	landmarks_list += src
 	return 1
 

code/game/objects/effects/spawners/bombspawner.dm

@@ -137,12 +137,12 @@
 	OT.master = V
 
 	PT.air_contents.temperature = PLASMA_FLASHPOINT
-	PT.air_contents.toxins = 15
-	PT.air_contents.carbon_dioxide = 33
+	PT.air_contents.toxins = 3
+	PT.air_contents.carbon_dioxide = 17
 	PT.air_contents.update_values()
 
 	OT.air_contents.temperature = PLASMA_FLASHPOINT
-	OT.air_contents.oxygen = 48
+	OT.air_contents.oxygen = 20
 	OT.air_contents.update_values()
 
 	var/obj/item/device/assembly/S
@@ -171,4 +171,4 @@
 
 	V.update_icon()
 
-	del(src)
+	del(src)

code/game/objects/items/bodybag.dm

@@ -34,6 +34,7 @@
 	icon_state = "bodybag_closed"
 	icon_closed = "bodybag_closed"
 	icon_opened = "bodybag_open"
+	var/item_path = /obj/item/bodybag
 	density = 0
 
 
@@ -74,7 +75,7 @@
 			if(opened)	return 0
 			if(contents.len)	return 0
 			visible_message("[usr] folds up the [src.name]")
-			new/obj/item/bodybag(get_turf(src))
+			new item_path(get_turf(src))
 			spawn(0)
 				del(src)
 			return
@@ -92,7 +93,6 @@
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
 
-
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
 		R.add_fingerprint(user)
@@ -104,11 +104,7 @@
 	name = "stasis bag"
 	desc = "A non-reusable plastic bag designed for the preservation of an occupant's brain by stasis."
 	icon = 'icons/obj/cryobag.dmi'
-	icon_state = "bodybag_closed"
-	icon_closed = "bodybag_closed"
-	icon_opened = "bodybag_open"
-	density = 0
-
+	item_path = /obj/item/bodybag/cryobag
 	var/used = 0
 
 	open()

code/game/objects/items/devices/PDA/PDA.dm

@@ -349,13 +349,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				dat += "<ul>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=1'><img src=pda_notes.png> Notekeeper</a></li>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=2'><img src=pda_mail.png> Messenger</a></li>"
+				dat += "<li><a href='byond://?src=\ref[src];choice=41'><img src=pda_notes.png> View Crew Manifest</a></li>"
 				//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> Nanotrasen Relay Chat</a></li>"
 
 				if (cartridge)
 					if (cartridge.access_clown)
 						dat += "<li><a href='byond://?src=\ref[src];choice=Honk'><img src=pda_honk.png> Honk Synthesizer</a></li>"
-					if (cartridge.access_manifest)
-						dat += "<li><a href='byond://?src=\ref[src];choice=41'><img src=pda_notes.png> View Crew Manifest</a></li>"
 					if(cartridge.access_status_display)
 						dat += "<li><a href='byond://?src=\ref[src];choice=42'><img src=pda_status.png> Set Status Display</a></li>"
 					dat += "</ul>"
@@ -500,7 +499,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 						dat += " <img src=pda_locked.png>"
 					dat += "</li>"
 
-
+			if (41) //crew manifest
+				dat += "<h4><img src=pda_notes.png> Crew Manifest</h4>"
+				dat += "Entries cannot be modified from this terminal.<br><br>"
+				if(data_core)
+					dat += data_core.get_manifest(1) // make it monochrome
+				dat += "<br>"
 
 			else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub.
 				dat += cart
@@ -572,6 +576,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					mode = 0
 				if("chatroom") // chatroom hub
 					mode = 5
+				if("41") //Manifest
+					mode = 41
 
 
 //MAIN FUNCTIONS===================================
@@ -700,7 +706,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 									difficulty += P.cartridge.access_engine
 									difficulty += P.cartridge.access_clown
 									difficulty += P.cartridge.access_janitor
-									difficulty += P.cartridge.access_manifest * 2
 								else
 									difficulty += 2
 

code/game/objects/items/devices/PDA/cart.dm

@@ -11,7 +11,6 @@
 	var/access_engine = 0
 	var/access_atmos = 0
 	var/access_medical = 0
-	var/access_manifest = 1 // Make all jobs able to access the manifest
 	var/access_clown = 0
 	var/access_mime = 0
 	var/access_janitor = 0
@@ -68,7 +67,6 @@
 		icon_state = "cart-s"
 		access_security = 1
 		access_medical = 1
-		access_manifest = 1
 
 
 	janitor
@@ -132,13 +130,11 @@
 	head
 		name = "Easy-Record DELUXE"
 		icon_state = "cart-h"
-		access_manifest = 1
 		access_status_display = 1
 
 	hop
 		name = "HumanResources9001"
 		icon_state = "cart-h"
-		access_manifest = 1
 		access_status_display = 1
 		access_quartermaster = 1
 		access_janitor = 1
@@ -152,7 +148,6 @@
 	hos
 		name = "R.O.B.U.S.T. DELUXE"
 		icon_state = "cart-hos"
-		access_manifest = 1
 		access_status_display = 1
 		access_security = 1
 
@@ -164,7 +159,6 @@
 	ce
 		name = "Power-On DELUXE"
 		icon_state = "cart-ce"
-		access_manifest = 1
 		access_status_display = 1
 		access_engine = 1
 		access_atmos = 1
@@ -172,7 +166,6 @@
 	cmo
 		name = "Med-U DELUXE"
 		icon_state = "cart-cmo"
-		access_manifest = 1
 		access_status_display = 1
 		access_reagent_scanner = 1
 		access_medical = 1
@@ -180,7 +173,6 @@
 	rd
 		name = "Signal Ace DELUXE"
 		icon_state = "cart-rd"
-		access_manifest = 1
 		access_status_display = 1
 		access_reagent_scanner = 1
 		access_atmos = 1
@@ -194,7 +186,6 @@
 		name = "Value-PAK Cartridge"
 		desc = "Now with 200% more value!"
 		icon_state = "cart-c"
-		access_manifest = 1
 		access_engine = 1
 		access_security = 1
 		access_medical = 1
@@ -276,14 +267,6 @@ Code:
 [radio:code]
 <a href='byond://?src=\ref[src];choice=Signal Code;scode=1'>+</a>
 <a href='byond://?src=\ref[src];choice=Signal Code;scode=5'>+</a><br>"}
-			if (41) //crew manifest
-
-				menu = "<h4><img src=pda_notes.png> Crew Manifest</h4>"
-				menu += "Entries cannot be modified from this terminal.<br><br>"
-				if(data_core)
-					menu += data_core.get_manifest(1) // make it monochrome
-				menu += "<br>"
-
 
 			if (42) //status displays
 				menu = "<h4><img src=pda_status.png> Station Status Display Interlink</h4>"

code/game/objects/items/devices/whistle.dm

@@ -4,18 +4,35 @@
 	icon_state = "voice0"
 	item_state = "flashbang"	//looks exactly like a flash (and nothing like a flashbang)
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
 
 	var/spamcheck = 0
-
+	var/emagged = 0
+	var/insults = 0//just in case
 
 /obj/item/device/hailer/attack_self(mob/living/carbon/user as mob)
 	if (spamcheck)
 		return
 
-	playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
-	user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
+	if(emagged)
+		if(insults >= 1)
+			playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0)//hueheuheuheuheuheuhe
+			user.visible_message("<span class='warning'>[user]'s [name] gurgles, \"FUCK YOUR CUNT YOU SHIT EATING CUNT TILL YOU ARE A MASS EATING SHIT CUNT. EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS TO FUCK UP SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FROM THE DEPTHS OF SHIT\"</span>")
+			insults--
+		else
+			user << "\red *BZZZZcuntZZZZT*"
+	else
+		playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
+		user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
 
 	spamcheck = 1
 	spawn(20)
-		spamcheck = 0
+		spamcheck = 0
+
+/obj/item/device/hailer/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/card/emag) && !emagged)
+		user << "\red You overload \the [src]'s voice synthesizer."
+		emagged = 1
+		insults = rand(1, 3)//to prevent dickflooding
+		return
+	return

code/game/objects/items/robot/robot_parts.dm

@@ -8,6 +8,7 @@
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)
 	var/list/part = null
+	var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.
 
 /obj/item/robot_parts/l_arm
 	name = "robot left arm"
@@ -161,7 +162,7 @@
 		else
 			user << "\blue You need to attach a flash to it first!"
 
-	if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain))
+	if(istype(W, /obj/item/device/mmi))
 		var/obj/item/device/mmi/M = W
 		if(check_completion())
 			if(!istype(loc,/turf))
@@ -193,7 +194,7 @@
 				user << "\red This [W] does not seem to fit."
 				return
 
-			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc))
+			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1)
 			if(!O)	return
 
 			user.drop_item()
@@ -214,6 +215,12 @@
 			O.cell.loc = O
 			W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
 
+			// Since we "magically" installed a cell, we also have to update the correct component.
+			if(O.cell)
+				var/datum/robot_component/cell_component = O.components["power cell"]
+				cell_component.wrapped = O.cell
+				cell_component.installed = 1
+
 			feedback_inc("cyborg_birth",1)
 			O.Namepick()
 
@@ -278,3 +285,13 @@
 		del(src)
 		return
 	return
+
+/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/weapon/card/emag))
+		if(sabotaged)
+			user << "\red [src] is already sabotaged!"
+		else
+			user << "\red You slide [W] into the dataport on [src] and short out the safeties."
+			sabotaged = 1
+		return
+	..()

code/game/objects/items/robot/robot_upgrades.dm

@@ -147,7 +147,7 @@
 		R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
 		for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
 			R.internals = src
-		R.icon_state="Miner+j"
+		//R.icon_state="Miner+j"
 		return 1
 
 

code/game/objects/items/stacks/medical.dm

@@ -33,6 +33,16 @@
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+
+		if(affecting.display_name == "head")
+			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
+				user << "\red You can't apply [src] through [H.head]!"
+				return 1
+		else
+			if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
+				user << "\red You can't apply [src] through [H.wear_suit]!"
+				return 1
+
 		if(affecting.status & ORGAN_ROBOT)
 			user << "\red This isn't useful at all on a robotic limb.."
 			return 1

code/game/objects/items/stacks/sheets/mineral.dm

@@ -124,7 +124,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
 	throw_range = 3
 	origin_tech = "materials=3"
 	perunit = 2000
-	sheettype = "plastic"
 
 var/global/list/datum/stack_recipe/plastic_recipes = list ( \
 	new/datum/stack_recipe("plastic crate", /obj/structure/closet/pcrate, 10, one_per_turf = 1, on_floor = 1), \

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -13,10 +13,20 @@
 var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("swivel chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \
 	null, \
+	new/datum/stack_recipe_list("office chairs",list( \
+		new/datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("light office chair", /obj/structure/stool/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1), \
+		), 5), \
+	new/datum/stack_recipe_list("comfy chairs", list( \
+		new/datum/stack_recipe("beige comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("black comfy chair", /obj/structure/stool/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("brown comfy chair", /obj/structure/stool/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("lime comfy chair", /obj/structure/stool/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("teal comfy chair", /obj/structure/stool/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1), \
+		), 2), \
+	null, \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \
 	new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts), \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1), \
@@ -28,10 +38,28 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	null, \
 	new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	null, \
+	new/datum/stack_recipe_list("airlock assemblies", list( \
+		new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+/*		new/datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \ */
+		new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		), 4), \
+	null, \
 	new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade), \
 	new/datum/stack_recipe("light fixture frame", /obj/item/light_fixture_frame, 2), \
 	new/datum/stack_recipe("small light fixture frame", /obj/item/light_fixture_frame/small, 1), \

code/game/objects/items/stacks/stack.dm

@@ -1,7 +1,8 @@
 /* Stack type objects!
  * Contains:
  * 		Stacks
- *		Recipe datum
+ * 		Recipe datum
+ * 		Recipe list datum
  */
 
 /*
@@ -32,51 +33,66 @@
 	return
 
 /obj/item/stack/attack_self(mob/user as mob)
-	interact(user)
+	list_recipes(user)
 
-/obj/item/stack/interact(mob/user as mob)
+/obj/item/stack/proc/list_recipes(mob/user as mob, recipes_sublist)
 	if (!recipes)
 		return
 	if (!src || amount<=0)
 		user << browse(null, "window=stack")
 	user.set_machine(src) //for correct work of onclose
+	var/list/recipe_list = recipes
+	if (recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list))
+		var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist]
+		recipe_list = srl.recipes
 	var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []<br>", src, src.amount)
-	for(var/i=1;i<=recipes.len,i++)
-		var/datum/stack_recipe/R = recipes[i]
-		if (isnull(R))
+	for(var/i=1;i<=recipe_list.len,i++)
+		var/E = recipe_list[i]
+		if (isnull(E))
 			t1 += "<hr>"
 			continue
-		if (i>1 && !isnull(recipes[i-1]))
+
+		if (i>1 && !isnull(recipe_list[i-1]))
 			t1+="<br>"
-		var/max_multiplier = round(src.amount / R.req_amount)
-		var/title as text
-		var/can_build = 1
-		can_build = can_build && (max_multiplier>0)
-		/*
-		if (R.one_per_turf)
-			can_build = can_build && !(locate(R.result_type) in usr.loc)
-		if (R.on_floor)
-			can_build = can_build && istype(usr.loc, /turf/simulated/floor)
-		*/
-		if (R.res_amount>1)
-			title+= "[R.res_amount]x [R.title]\s"
-		else
-			title+= "[R.title]"
-		title+= " ([R.req_amount] [src.singular_name]\s)"
-		if (can_build)
-			t1 += text("<A href='?src=\ref[];make=[]'>[]</A>  ", src, i, title)
-		else
-			t1 += text("[]", title)
-			continue
-		if (R.max_res_amount>1 && max_multiplier>1)
-			max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
-			t1 += " |"
-			var/list/multipliers = list(5,10,25)
-			for (var/n in multipliers)
-				if (max_multiplier>=n)
-					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
-			if (!(max_multiplier in multipliers))
-				t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
+
+		if (istype(E, /datum/stack_recipe_list))
+			var/datum/stack_recipe_list/srl = E
+			if (src.amount >= srl.req_amount)
+				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
+			else
+				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
+
+		if (istype(E, /datum/stack_recipe))
+			var/datum/stack_recipe/R = E
+			var/max_multiplier = round(src.amount / R.req_amount)
+			var/title as text
+			var/can_build = 1
+			can_build = can_build && (max_multiplier>0)
+			/*
+			if (R.one_per_turf)
+				can_build = can_build && !(locate(R.result_type) in usr.loc)
+			if (R.on_floor)
+				can_build = can_build && istype(usr.loc, /turf/simulated/floor)
+			*/
+			if (R.res_amount>1)
+				title+= "[R.res_amount]x [R.title]\s"
+			else
+				title+= "[R.title]"
+			title+= " ([R.req_amount] [src.singular_name]\s)"
+			if (can_build)
+				t1 += text("<A href='?src=\ref[src];sublist=[recipes_sublist];make=[i]'>[title]</A>  ")
+			else
+				t1 += text("[]", title)
+				continue
+			if (R.max_res_amount>1 && max_multiplier>1)
+				max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
+				t1 += " |"
+				var/list/multipliers = list(5,10,25)
+				for (var/n in multipliers)
+					if (max_multiplier>=n)
+						t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
+				if (!(max_multiplier in multipliers))
+					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
 
 	t1 += "</TT></body></HTML>"
 	user << browse(t1, "window=stack")
@@ -87,10 +103,18 @@
 	..()
 	if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
 		return
+
+	if (href_list["sublist"] && !href_list["make"])
+		list_recipes(usr, text2num(href_list["sublist"]))
+
 	if (href_list["make"])
 		if (src.amount < 1) del(src) //Never should happen
 
-		var/datum/stack_recipe/R = recipes[text2num(href_list["make"])]
+		var/list/recipes_list = recipes
+		if (href_list["sublist"])
+			var/datum/stack_recipe_list/srl = recipes_list[text2num(href_list["sublist"])]
+			recipes_list = srl.recipes
+		var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
 		var/multiplier = text2num(href_list["multiplier"])
 		if (!multiplier) multiplier = 1
 		if (src.amount < R.req_amount*multiplier)
@@ -222,4 +246,16 @@
 		src.max_res_amount = max_res_amount
 		src.time = time
 		src.one_per_turf = one_per_turf
-		src.on_floor = on_floor
+		src.on_floor = on_floor
+
+/*
+ * Recipe list datum
+ */
+/datum/stack_recipe_list
+	var/title = "ERROR"
+	var/list/recipes = null
+	var/req_amount = 1
+	New(title, recipes, req_amount = 1)
+		src.title = title
+		src.recipes = recipes
+		src.req_amount = req_amount

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

@@ -101,6 +101,17 @@
 /obj/item/weapon/card/id/GetID()
 	return src
 
+/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if(istype(W,/obj/item/weapon/id_wallet))
+		user << "You slip [src] into [W]."
+		src.name = "[src.registered_name]'s [W.name] ([src.assignment])"
+		src.desc = W.desc
+		src.icon = W.icon
+		src.icon_state = W.icon_state
+		del(W)
+		return
+
 /obj/item/weapon/card/id/verb/read()
 	set name = "Read ID Card"
 	set category = "Object"

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

@@ -153,6 +153,7 @@
 	icon_state = "knife"
 	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 	flags = FPRINT | TABLEPASS | CONDUCT
+	sharp = 1
 	force = 10.0
 	w_class = 3.0
 	throwforce = 6.0

code/game/objects/items/weapons/storage/belt.dm

@@ -127,7 +127,7 @@
 		"/obj/item/device/flashlight",
 		"/obj/item/device/pda",
 		"/obj/item/device/radio/headset",
-		"/obj/item/weapon/melee/baton",
+		"/obj/item/weapon/melee",
 		"/obj/item/taperoll/police",
 		"/obj/item/weapon/gun/energy/taser"
 		)

code/game/objects/items/weapons/storage/boxes.dm

@@ -277,7 +277,41 @@
 		..()
 		for(var/i = 1; i <= 5; i++)
 			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
+/obj/item/weapon/storage/box/farwacubes
+	name = "farwa cube box"
+	desc = "Drymate brand farwa cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/farwacube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/farwacube/wrapped(src)
 
+/obj/item/weapon/storage/box/stokcubes
+	name = "stok cube box"
+	desc = "Drymate brand stok cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/stokcube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/stokcube/wrapped(src)
+
+/obj/item/weapon/storage/box/neaeracubes
+	name = "neaera cube box"
+	desc = "Drymate brand neaera cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/stokcube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/neaeracube/wrapped(src)
 
 /obj/item/weapon/storage/box/ids
 	name = "spare IDs"

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

@@ -19,7 +19,7 @@
 	m_amt = 10000
 	g_amt = 5000
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 
 /*HAHA, SUCK IT, 2000 LINES OF SPAGHETTI CODE!
@@ -133,7 +133,7 @@ LOOK FOR SURGERY.DM*/
 	m_amt = 5000
 	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "pinched")
 
@@ -268,7 +268,7 @@ LOOK FOR SURGERY.DM*/
 	m_amt = 5000
 	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("burnt")
 
@@ -360,7 +360,7 @@ LOOK FOR SURGERY.DM*/
 	g_amt = 10000
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("drilled")
 
@@ -379,7 +379,7 @@ LOOK FOR SURGERY.DM*/
 	icon_state = "scalpel"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 10.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
@@ -631,7 +631,7 @@ LOOK FOR SURGERY.DM*/
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
@@ -797,6 +797,7 @@ LOOK FOR SURGERY.DM*/
 	icon = 'surgery.dmi'
 	icon_state = "bone-gel"
 	force = 0
+	w_class = 2.0
 	throwforce = 1.0
 
 /obj/item/weapon/FixOVein
@@ -806,6 +807,7 @@ LOOK FOR SURGERY.DM*/
 	force = 0
 	throwforce = 1.0
 	origin_tech = "materials=1;biotech=3"
+	w_class = 2.0
 	var/usage_amount = 10
 
 /obj/item/weapon/bonesetter
@@ -816,4 +818,5 @@ LOOK FOR SURGERY.DM*/
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
+	w_class = 2.0
 	attack_verb = list("attacked", "hit", "bludgeoned")

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

@@ -125,7 +125,7 @@
 		"You hear an ominous click.")
 		icon_state = "telebaton_1"
 		item_state = "telebaton_1"
-		w_class = 4
+		w_class = 3
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")
 	else

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

@@ -449,12 +449,12 @@
 		if(S.brute_dam)
 			S.heal_damage(15,0,0,1)
 			if(user != M)
-				user.visible_message("\red You patch some dents on \the [M]'s [S.display_name]",\
-				"\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\
+				user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\
+				"\red You patch some dents on \the [M]'s [S.display_name]",\
 				"You hear a welder.")
 			else
-				user.visible_message("\red You patch some dents on your [S.display_name]",\
-				"\red \The [user] patches some dents on their [S.display_name] with \the [src]",\
+				user.visible_message("\red \The [user] patches some dents on their [S.display_name] with \the [src]",\
+				"\red You patch some dents on your [S.display_name]",\
 				"You hear a welder.")
 		else
 			user << "Nothing to fix!"

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

@@ -136,4 +136,15 @@
 
 /obj/item/weapon/katana/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-	return ..()
+	return ..()
+
+/obj/item/weapon/harpoon
+	name = "harpoon"
+	sharp = 1
+	desc = "Tharr she blows!"
+	icon_state = "harpoon"
+	item_state = "harpoon"
+	force = 20
+	throwforce = 15
+	w_class = 3
+	attack_verb = list("jabbed","stabbed","ripped")

code/game/objects/random/random.dm

@@ -0,0 +1,104 @@
+/obj/random
+	name = "Random Object"
+	desc = "This item type is used to spawn random objects at round-start"
+	icon = 'icons/misc/mark.dmi'
+	icon_state = "rup"
+	var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything
+
+	
+// creates a new object and deletes itself
+/obj/random/New()
+	..()
+	if (!prob(spawn_nothing_percentage))
+		spawn_item()
+	del src
+
+
+// this function should return a specific item to spawn
+/obj/random/proc/item_to_spawn()
+	return 0
+
+
+// creates the random item
+/obj/random/proc/spawn_item()
+	var/build_path = item_to_spawn()
+	return (new build_path(src.loc))
+
+
+/obj/random/tool
+	name = "Random Tool"
+	desc = "This is a random tool"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "welder"
+	item_to_spawn()
+		return pick(/obj/item/weapon/screwdriver,\
+					/obj/item/weapon/wirecutters,\
+					/obj/item/weapon/weldingtool,\
+					/obj/item/weapon/crowbar,\
+					/obj/item/weapon/wrench,\
+					/obj/item/device/flashlight)
+					
+					
+/obj/random/technology_scanner
+	name = "Random Scanner"
+	desc = "This is a random technology scanner."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "atmos"
+	item_to_spawn()
+		return pick(prob(5);/obj/item/device/t_scanner,\
+					prob(2);/obj/item/device/radio/intercom,\
+					prob(5);/obj/item/device/analyzer)
+		
+	
+/obj/random/powercell
+	name = "Random Powercell"
+	desc = "This is a random powercell."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	item_to_spawn()
+		return pick(prob(10);/obj/item/weapon/cell/crap,\
+					prob(40);/obj/item/weapon/cell,\
+					prob(40);/obj/item/weapon/cell/high,\
+					prob(9);/obj/item/weapon/cell/super,\
+					prob(1);/obj/item/weapon/cell/hyper)
+					
+					
+/obj/random/bomb_supply
+	name = "Bomb Supply"
+	desc = "This is a random bomb supply."
+	icon = 'icons/obj/assemblies/new_assemblies.dmi'
+	icon_state = "signaller"
+	item_to_spawn()
+		return pick(/obj/item/device/assembly/igniter,\
+					/obj/item/device/assembly/prox_sensor,\
+					/obj/item/device/assembly/signaler)
+
+
+/obj/random/toolbox
+	name = "Random Toolbox"
+	desc = "This is a random toolbox."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "red"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/storage/toolbox/mechanical,\
+					prob(2);/obj/item/weapon/storage/toolbox/electrical,\
+					prob(1);/obj/item/weapon/storage/toolbox/emergency)
+					
+					
+/obj/random/tech_supply
+	name = "Random Tech Supply"
+	desc = "This is a random piece of technology supplies."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	spawn_nothing_percentage = 50
+	item_to_spawn()
+		return pick(prob(3);/obj/random/powercell,\
+					prob(2);/obj/random/technology_scanner,\
+					prob(1);/obj/item/weapon/packageWrap,\
+					prob(2);/obj/random/bomb_supply,\
+					prob(1);/obj/item/weapon/extinguisher,\
+					prob(1);/obj/item/clothing/gloves/fyellow,\
+					prob(3);/obj/item/weapon/cable_coil,\
+					prob(2);/obj/random/toolbox,\
+					prob(2);/obj/item/weapon/storage/belt/utility,\
+					prob(5);/obj/random/tool)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -104,6 +104,10 @@
 			new /obj/item/weapon/storage/backpack/industrial(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
 		new /obj/item/clothing/under/rank/engineer(src)
 		new /obj/item/clothing/shoes/orange(src)
 		new /obj/item/weapon/storage/toolbox/mechanical(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -81,6 +81,7 @@
 		new /obj/item/clothing/shoes/black(src)
 		new /obj/item/clothing/shoes/leather(src)
 		new /obj/item/clothing/shoes/white(src)
+		new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
 		return
 
 
@@ -153,6 +154,7 @@
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/weapon/storage/box/holobadge(src)
 		return
 
 
@@ -187,6 +189,7 @@
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/taperoll/police(src)
 		new /obj/item/device/hailer(src)
+		new /obj/item/clothing/tie/storage/black_vest(src)
 		return
 
 

code/game/objects/structures/door_assembly.dm

@@ -6,278 +6,133 @@ obj/structure/door_assembly
 	anchored = 0
 	density = 1
 	var/state = 0
-	var/mineral = null
-	var/base_icon_state = "door_as_0"
-	var/glass_base_icon_state = "door_as_g0"
+	var/base_icon_state = ""
+	var/base_name = "Airlock"
 	var/obj/item/weapon/airlock_electronics/electronics = null
-	var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed
-	var/glass_type = /obj/machinery/door/airlock/glass
-	var/glass = null
+	var/airlock_type = "" //the type path of the airlock once completed
+	var/glass_type = "/glass"
+	var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
 	var/created_name = null
 
 	New()
-		base_icon_state = copytext(icon_state,1,lentext(icon_state))
-
-	door_assembly_0
-		name = "Airlock Assembly"
-		icon_state = "door_as_1"
-		airlock_type = /obj/machinery/door/airlock
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		update_state()
 
 	door_assembly_com
-		name = "Command Airlock Assembly"
-		icon_state = "door_as_com1"
-		glass_base_icon_state = "door_as_gcom"
-		glass_type = /obj/machinery/door/airlock/glass_command
-		airlock_type = /obj/machinery/door/airlock/command
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gcom1"
+		base_icon_state = "com"
+		base_name = "Command Airlock"
+		glass_type = "/glass_command"
+		airlock_type = "/command"
 
 	door_assembly_sec
-		name = "Security Airlock Assembly"
-		icon_state = "door_as_sec1"
-		glass_base_icon_state = "door_as_gsec"
-		glass_type = /obj/machinery/door/airlock/glass_security
-		airlock_type = /obj/machinery/door/airlock/security
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gsec1"
+		base_icon_state = "sec"
+		base_name = "Security Airlock"
+		glass_type = "/glass_security"
+		airlock_type = "/security"
 
 	door_assembly_eng
-		name = "Engineering Airlock Assembly"
-		icon_state = "door_as_eng1"
-		glass_base_icon_state = "door_as_geng"
-		glass_type = /obj/machinery/door/airlock/glass_engineering
-		airlock_type = /obj/machinery/door/airlock/engineering
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_geng1"
+		base_icon_state = "eng"
+		base_name = "Engineering Airlock"
+		glass_type = "/glass_engineering"
+		airlock_type = "/engineering"
 
 	door_assembly_min
-		name = "Mining Airlock Assembly"
-		icon_state = "door_as_min1"
-		glass_base_icon_state = "door_as_gmin"
-		glass_type = /obj/machinery/door/airlock/glass_mining
-		airlock_type = /obj/machinery/door/airlock/mining
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gmin1"
+		base_icon_state = "min"
+		base_name = "Mining Airlock"
+		glass_type = "/glass_mining"
+		airlock_type = "/mining"
 
 	door_assembly_atmo
-		name = "Atmospherics Airlock Assembly"
-		icon_state = "door_as_atmo1"
-		glass_base_icon_state = "door_as_gatmo"
-		glass_type = /obj/machinery/door/airlock/glass_atmos
-		airlock_type = /obj/machinery/door/airlock/atmos
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gatmo1"
+		base_icon_state = "atmo"
+		base_name = "Atmospherics Airlock"
+		glass_type = "/glass_atmos"
+		airlock_type = "/atmos"
 
 	door_assembly_research
-		name = "Research Airlock Assembly"
-		icon_state = "door_as_res1"
-		glass_base_icon_state = "door_as_gres"
-		glass_type = /obj/machinery/door/airlock/glass_research
-		airlock_type = /obj/machinery/door/airlock/research
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gres1"
+		base_icon_state = "res"
+		base_name = "Research Airlock"
+		glass_type = "/glass_research"
+		airlock_type = "/research"
 
 	door_assembly_science
-		name = "Science Airlock Assembly"
-		icon_state = "door_as_sci1"
-		glass_base_icon_state = "door_as_gsci"
-		glass_type = /obj/machinery/door/airlock/glass_science
-		airlock_type = /obj/machinery/door/airlock/science
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gsci1"
+		base_icon_state = "sci"
+		base_name = "Science Airlock"
+		glass_type = "/glass_science"
+		airlock_type = "/science"
 
 	door_assembly_med
-		name = "Medical Airlock Assembly"
-		icon_state = "door_as_med1"
-		airlock_type = /obj/machinery/door/airlock/medical
-		anchored = 1
-		density = 1
-		state = 1
-
-		glass
-			mineral = "glass"
-			icon_state = "door_as_gmed1"
+		base_icon_state = "med"
+		base_name = "Medical Airlock"
+		glass_type = "/glass_medical"
+		airlock_type = "/medical"
 
 	door_assembly_mai
-		name = "Maintenance Airlock Assembly"
-		icon_state = "door_as_mai1"
-		airlock_type = /obj/machinery/door/airlock/maintenance
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "mai"
+		base_name = "Maintenance Airlock"
+		airlock_type = "/maintenance"
+		glass = -1
 
 	door_assembly_ext
-		name = "External Airlock Assembly"
-		icon_state = "door_as_ext1"
-		airlock_type = /obj/machinery/door/airlock/external
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "ext"
+		base_name = "External Airlock"
+		airlock_type = "/external"
+		glass = -1
 
 	door_assembly_fre
-		name = "Freezer Airlock Assembly"
-		icon_state = "door_as_fre1"
-		airlock_type = /obj/machinery/door/airlock/freezer
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "fre"
+		base_name = "Freezer Airlock"
+		airlock_type = "/freezer"
+		glass = -1
 
 	door_assembly_hatch
-		name = "Airtight Hatch Assembly"
-		icon_state = "door_as_hatch1"
-		airlock_type = /obj/machinery/door/airlock/hatch
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "hatch"
+		base_name = "Airtight Hatch"
+		airlock_type = "/hatch"
+		glass = -1
 
 	door_assembly_mhatch
-		name = "Maintenance Hatch Assembly"
-		icon_state = "door_as_mhatch1"
-		airlock_type = /obj/machinery/door/airlock/maintenance_hatch
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-	door_assembly_glass
-		name = "Glass Airlock Assembly"
-		icon_state = "door_as_g1"
-		airlock_type = /obj/machinery/door/airlock/glass
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "glass"
-
-	door_assembly_gold
-		name = "Gold Airlock Assembly"
-		icon_state = "door_as_gold1"
-		airlock_type = /obj/machinery/door/airlock/gold
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "gold"
-
-	door_assembly_silver
-		name = "Silver Airlock Assembly"
-		icon_state = "door_as_silver1"
-		airlock_type = /obj/machinery/door/airlock/silver
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "silver"
-
-	door_assembly_diamond
-		name = "Diamond Airlock Assembly"
-		icon_state = "door_as_diamond1"
-		airlock_type = /obj/machinery/door/airlock/diamond
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "diamond"
-
-	door_assembly_uranium
-		name = "Uranium Airlock Assembly"
-		icon_state = "door_as_uranium1"
-		airlock_type = /obj/machinery/door/airlock/uranium
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "uranium"
-
-	door_assembly_plasma
-		name = "Plasma Airlock Assembly"
-		icon_state = "door_as_plasma1"
-		airlock_type = /obj/machinery/door/airlock/plasma
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "plasma"
-
-	door_assembly_clown
-		name = "Bananium Airlock Assembly"
-		icon_state = "door_as_clown1"
-		airlock_type = /obj/machinery/door/airlock/clown
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "clown"
-
-	door_assembly_sandstone
-		name = "Sandstone Airlock Assembly"
-		icon_state = "door_as_sandstone1"
-		airlock_type = /obj/machinery/door/airlock/sandstone
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "sandstone"
-
-	door_assembly_sandstone
-		name = "Sandstone Airlock Assembly"
-		icon_state = "door_as_sandstone1"
-		airlock_type = /obj/machinery/door/airlock/sandstone
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "sandstone"
+		base_icon_state = "mhatch"
+		base_name = "Maintenance Hatch"
+		airlock_type = "/maintenance_hatch"
+		glass = -1
 
 	door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
-		name = "High Tech Security Assembly"
-		icon_state = "door_as_highsec1"
-		airlock_type = /obj/machinery/door/airlock/highsecurity
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "highsec"
+		base_name = "High Security Airlock"
+		airlock_type = "/highsecurity"
+		glass = -1
+
+	multi_tile
+		icon = 'icons/obj/doors/door_assembly2x1.dmi'
+		dir = EAST
+		var/width = 1
+
+/*Temporary until we get sprites.
+		glass_type = "/multi_tile/glass"
+		airlock_type = "/multi_tile/maint"
+		glass = 1*/
+		base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1.
+		airlock_type = "/multi_tile/glass"
+		glass = -1 //To prevent bugs in deconstruction process.
+
+		New()
+			if(dir in list(EAST, WEST))
+				bound_width = width * world.icon_size
+				bound_height = world.icon_size
+			else
+				bound_width = world.icon_size
+				bound_height = width * world.icon_size
+			update_state()
+
+		Move()
+			. = ..()
+			if(dir in list(EAST, WEST))
+				bound_width = width * world.icon_size
+				bound_height = world.icon_size
+			else
+				bound_width = world.icon_size
+				bound_height = width * world.icon_size
+
+
 
 /obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/pen))
@@ -287,46 +142,47 @@ obj/structure/door_assembly
 		created_name = t
 		return
 
-	if(istype(W, /obj/item/weapon/weldingtool) && !anchored )
+	if(istype(W, /obj/item/weapon/weldingtool) && ( (istext(glass)) || (glass == 1) || (!anchored) ))
 		var/obj/item/weapon/weldingtool/WT = W
-		if(WT.remove_fuel(0,user))
-			user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.")
+		if (WT.remove_fuel(0, user))
 			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
-
-			if(do_after(user, 40))
-				if(!src || !WT.isOn()) return
-				user << "\blue You dissasembled the airlock assembly!"
-				new /obj/item/stack/sheet/metal(get_turf(src), 4)
-				if (mineral)
-					if (mineral == "glass")
-						new /obj/item/stack/sheet/rglass(get_turf(src))
-					else
-						var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
-						new M(get_turf(src))
-						new M(get_turf(src))
-				del(src)
+			if(istext(glass))
+				user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You welded the [glass] plating off!"
+					var/M = text2path("/obj/item/stack/sheet/mineral/[glass]")
+					new M(src.loc, 2)
+					glass = 0
+			else if(glass == 1)
+				user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You welded the glass panel out!"
+					new /obj/item/stack/sheet/rglass(src.loc)
+					glass = 0
+			else if(!anchored)
+				user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You dissasembled the airlock assembly!"
+					new /obj/item/stack/sheet/metal(src.loc, 4)
+					del (src)
 		else
-			user << "\blue You need more welding fuel to dissassemble the airlock assembly."
+			user << "\blue You need more welding fuel."
 			return
 
-	else if(istype(W, /obj/item/weapon/wrench) && !anchored )
+	else if(istype(W, /obj/item/weapon/wrench) && state == 0)
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
-		user.visible_message("[user] secures the airlock assembly to the floor.", "You start to secure the airlock assembly to the floor.")
+		if(anchored)
+			user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor.")
+		else
+			user.visible_message("[user] secures the airlock assembly to the floor.", "You start to secure the airlock assembly to the floor.")
 
 		if(do_after(user, 40))
 			if(!src) return
-			user << "\blue You secured the airlock assembly!"
-			src.name = "Secured Airlock Assembly"
-			src.anchored = 1
-
-	else if(istype(W, /obj/item/weapon/wrench) && anchored )
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
-		user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor.")
-		if(do_after(user, 40))
-			if(!src) return
-			user << "\blue You unsecured the airlock assembly!"
-			src.name = "Airlock Assembly"
-			src.anchored = 0
+			user << "\blue You [anchored? "un" : ""]secured the airlock assembly!"
+			anchored = !anchored
 
 	else if(istype(W, /obj/item/weapon/cable_coil) && state == 0 && anchored )
 		var/obj/item/weapon/cable_coil/coil = W
@@ -336,7 +192,6 @@ obj/structure/door_assembly
 			coil.use(1)
 			src.state = 1
 			user << "\blue You wire the Airlock!"
-			src.name = "Wired Airlock Assembly"
 
 	else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 )
 		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
@@ -345,9 +200,8 @@ obj/structure/door_assembly
 		if(do_after(user, 40))
 			if(!src) return
 			user << "\blue You cut the airlock wires.!"
-			new/obj/item/weapon/cable_coil(get_turf(user), 1)
+			new/obj/item/weapon/cable_coil(src.loc, 1)
 			src.state = 0
-			src.name = "Secured Airlock Assembly"
 
 	else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W:icon_state != "door_electronics_smoked")
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -364,8 +218,6 @@ obj/structure/door_assembly
 		else
 			W.loc = src.loc
 
-			//del(W)
-
 	else if(istype(W, /obj/item/weapon/crowbar) && state == 2 )
 		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 		user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to install electronics into the airlock assembly.")
@@ -382,32 +234,28 @@ obj/structure/door_assembly
 				ae = electronics
 				electronics = null
 				ae.loc = src.loc
-	else if(istype(W, /obj/item/stack/sheet) && !mineral)
-		var/obj/item/stack/sheet/G = W
-		if(G)
-			if(G.amount>=1)
-				if(G.type == /obj/item/stack/sheet/rglass)
+
+	else if(istype(W, /obj/item/stack/sheet) && !glass)
+		var/obj/item/stack/sheet/S = W
+		if (S)
+			if (S.amount>=1)
+				if(istype(S, /obj/item/stack/sheet/rglass))
 					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-					user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
+					user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 					if(do_after(user, 40))
 						user << "\blue You installed reinforced glass windows into the airlock assembly!"
-						G.use(1)
-						src.mineral = "glass"
-						src.name = "Near finished Window Airlock Assembly"
-						src.airlock_type = /obj/machinery/door/airlock/glass
-						src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end.
-				else if(istype(G, /obj/item/stack/sheet/mineral))
-					var/M = G.sheettype
-					if(G.amount>=2)
+						S.use(1)
+						glass = 1
+				else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype)
+					var/M = S.sheettype
+					if(S.amount>=2)
 						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-						user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
+						user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 						if(do_after(user, 40))
 							user << "\blue You installed [M] plating into the airlock assembly!"
-							G.use(2)
-							src.mineral = "[M]"
-							src.name = "Near finished [M] Airlock Assembly"
-							src.airlock_type = text2path ("/obj/machinery/door/airlock/[M]")
-							src.base_icon_state = "door_as_[M]"
+							S.use(2)
+							glass = "[M]"
+
 	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 )
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 		user << "\blue Now finishing the airlock."
@@ -415,20 +263,40 @@ obj/structure/door_assembly
 		if(do_after(user, 40))
 			if(!src) return
 			user << "\blue You finish the airlock!"
-			var/obj/machinery/door/airlock/door
-			if (mineral)
-				airlock_type = text2path("/obj/machinery/door/airlock/[mineral]")
-			door = new src.airlock_type( src.loc )
-			//door.req_access = src.req_access
+			var/path
+			if(istext(glass))
+				path = text2path("/obj/machinery/door/airlock/[glass]")
+			else if (glass == 1)
+				path = text2path("/obj/machinery/door/airlock[glass_type]")
+			else
+				path = text2path("/obj/machinery/door/airlock[airlock_type]")
+			var/obj/machinery/door/airlock/door = new path(src.loc)
+			door.assembly_type = type
 			door.electronics = src.electronics
-			door.req_access = src.electronics.conf_access
+			if(src.electronics.one_access)
+				door.req_access = null
+				door.req_one_access = src.electronics.conf_access
+			else
+				door.req_access = src.electronics.conf_access
 			if(created_name)
 				door.name = created_name
+			else
+				door.name = "[istext(glass) ? "[glass] airlock" : base_name]"
 			src.electronics.loc = door
 			del(src)
 	else
 		..()
-	icon_state = "[base_icon_state][state]"
-	//This updates the icon_state. They are named as "door_as1_eng" where the 1 in that example
-	//represents what state it's in. So the most generic algorithm for the correct updating of
-	//this is simply to change the number.
+	update_state()
+
+/obj/structure/door_assembly/proc/update_state()
+	icon_state = "door_as_[glass == 1 ? "g" : ""][istext(glass) ? glass : base_icon_state][state]"
+	name = ""
+	switch (state)
+		if(0)
+			if (anchored)
+				name = "Secured "
+		if(1)
+			name = "Wired "
+		if(2)
+			name = "Near Finished "
+	name += "[glass == 1 ? "Window " : ""][istext(glass) ? "[glass] Airlock" : base_name] Assembly"

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -13,6 +13,12 @@
 	icon_state = "bed"
 	var/mob/living/buckled_mob
 
+/obj/structure/stool/psychbed
+	name = "psych bed"
+	desc = "For prime comfort during psychiatric evaluations."
+	icon_state = "psychbed"
+	var/mob/living/buckled_mob
+
 /obj/structure/stool/bed/alien
 	name = "resting contraption"
 	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"

code/game/objects/structures/windoor_assembly.dm

@@ -107,17 +107,17 @@ obj/structure/windoor_assembly/Del()
 						src.name = "Windoor Assembly"
 
 			//Adding plasteel makes the assembly a secure windoor assembly. Step 2 (optional) complete.
-			else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure)
-				var/obj/item/stack/sheet/plasteel/P = W
-				if(P.amount < 2)
-					user << "\red You need more plasteel to do this."
+			else if(istype(W, /obj/item/stack/rods) && !secure)
+				var/obj/item/stack/rods/R = W
+				if(R.amount < 4)
+					user << "\red You need more rods to do this."
 					return
-				user << "\blue You start to reinforce the windoor with plasteel."
+				user << "\blue You start to reinforce the windoor with rods."
 
 				if(do_after(user,40))
 					if(!src) return
 
-					P.use(2)
+					R.use(4)
 					user << "\blue You reinforce the windoor."
 					src.secure = "secure_"
 					if(src.anchored)
@@ -145,7 +145,7 @@ obj/structure/windoor_assembly/Del()
 		if("02")
 
 			//Removing wire from the assembly. Step 5 undone.
-			if(istype(W, /obj/item/weapon/wirecutters))
+			if(istype(W, /obj/item/weapon/wirecutters) && !src.electronics)
 				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
 				user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
 
@@ -156,12 +156,12 @@ obj/structure/windoor_assembly/Del()
 					new/obj/item/weapon/cable_coil(get_turf(user), 1)
 					src.state = "01"
 					if(src.secure)
-						src.name = "Secure Wired Windoor Assembly"
+						src.name = "Secure Anchored Windoor Assembly"
 					else
-						src.name = "Wired Windoor Assembly"
+						src.name = "Anchored Windoor Assembly"
 
 			//Adding airlock electronics for access. Step 6 complete.
-			else if(istype(W, /obj/item/weapon/airlock_electronics))
+			else if(istype(W, /obj/item/weapon/airlock_electronics) && W:icon_state != "door_electronics_smoked")
 				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
 
@@ -177,22 +177,20 @@ obj/structure/windoor_assembly/Del()
 					W.loc = src.loc
 
 			//Screwdriver to remove airlock electronics. Step 6 undone.
-			else if(istype(W, /obj/item/weapon/screwdriver))
+			else if(istype(W, /obj/item/weapon/screwdriver) && src.electronics)
 				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.")
 
 				if(do_after(user, 40))
-					if(!src) return
+					if(!src || !src.electronics) return
 					user << "\blue You've removed the airlock electronics!"
-					src.name = "Wired Windoor Assembly"
-					var/obj/item/weapon/airlock_electronics/ae
-					if (!electronics)
-						ae = new/obj/item/weapon/airlock_electronics( src.loc )
+					if(src.secure)
+						src.name = "Secure Wired Windoor Assembly"
 					else
-						ae = electronics
-						electronics = null
-						ae.loc = src.loc
-
+						src.name = "Wired Windoor Assembly"
+					var/obj/item/weapon/airlock_electronics/ae = electronics
+					electronics = null
+					ae.loc = src.loc
 
 			//Crowbar to complete the assembly, Step 7 complete.
 			else if(istype(W, /obj/item/weapon/crowbar))
@@ -221,7 +219,11 @@ obj/structure/windoor_assembly/Del()
 						windoor.dir = src.dir
 						windoor.density = 0
 
-						windoor.req_access = src.electronics.conf_access
+						if(src.electronics.one_access)
+							windoor.req_access = null
+							windoor.req_one_access = src.electronics.conf_access
+						else
+							windoor.req_access = src.electronics.conf_access
 						windoor.electronics = src.electronics
 						src.electronics.loc = windoor
 					else
@@ -235,7 +237,11 @@ obj/structure/windoor_assembly/Del()
 						windoor.dir = src.dir
 						windoor.density = 0
 
-						windoor.req_access = src.electronics.conf_access
+						if(src.electronics.one_access)
+							windoor.req_access = null
+							windoor.req_one_access = src.electronics.conf_access
+						else
+							windoor.req_access = src.electronics.conf_access
 						windoor.electronics = src.electronics
 						src.electronics.loc = windoor
 

code/game/response_team.dm

@@ -1,7 +1,7 @@
 //STRIKE TEAMS
 
 var/list/response_team_members = list()
-var/send_emergency_team = 0
+var/global/send_emergency_team = 0
 
 client/verb/JoinResponseTeam()
 	set category = "IC"
@@ -19,7 +19,7 @@ client/verb/JoinResponseTeam()
 		var/leader_selected = (response_team_members.len == 0)
 
 
-		for (var/obj/effect/landmark/L in world) if (L.name == "Commando")
+		for (var/obj/effect/landmark/L in landmarks_list) if (L.name == "Commando")
 
 			var/new_name = input(usr, "Pick a name","Name") as null|text
 			if(!new_name) return
@@ -43,9 +43,10 @@ client/verb/JoinResponseTeam()
 proc/percentage_dead()
 	var/total = 0
 	var/deadcount = 0
-	for(var/mob/living/carbon/human/H in world) if(H.mind) // I *think* monkeys gone human don't have a mind
-		if(H.stat == 2) deadcount++
-		total++
+	for(var/mob/living/carbon/human/H in mob_list)
+		if(H.client) // Monkeys and mice don't have a client, amirite?
+			if(H.stat == 2) deadcount++
+			total++
 
 	if(total == 0) return 0
 	else return round(100 * deadcount / total)
@@ -54,7 +55,7 @@ proc/percentage_dead()
 proc/percentage_antagonists()
 	var/total = 0
 	var/antagonists = 0
-	for(var/mob/living/carbon/human/H in world)
+	for(var/mob/living/carbon/human/H in mob_list)
 		if(is_special_character(H) >= 1)
 			antagonists++
 		total++
@@ -81,7 +82,7 @@ proc/trigger_armed_response_team(var/force = 0)
 
 	send_emergency_team = 1
 
-	var/area/security/nuke_storage/nukeloc = locate()//To find the nuke in the vault
+/*	var/area/security/nuke_storage/nukeloc = locate()//To find the nuke in the vault
 	var/obj/machinery/nuclearbomb/nuke = locate() in nukeloc
 	if(!nuke)
 		nuke = locate() in world
@@ -93,6 +94,7 @@ proc/trigger_armed_response_team(var/force = 0)
 			P.loc = A.loc
 			del(A)
 			continue
+*/
 
 /client/proc/create_response_team(obj/spawn_location, leader_selected = 0, commando_name)
 
@@ -223,6 +225,16 @@ proc/trigger_armed_response_team(var/force = 0)
 	camera.network = "CREED"
 	camera.c_tag = real_name
 
+	//Replaced with new ERT uniform
+	equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
+	equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes)
+	equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
+	equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_ears)
+	equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
+	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(src), slot_back)
+/*
+
+	//Old ERT Uniform
 	//Basic Uniform
 	equip_to_slot_or_del(new /obj/item/clothing/under/syndicate/tacticool(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_l_store)
@@ -245,7 +257,7 @@ proc/trigger_armed_response_team(var/force = 0)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(src), slot_back)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack)
-
+*/
 	var/obj/item/weapon/card/id/W = new(src)
 	W.name = "[real_name]'s ID Card (Emergency Response Team)"
 	W.icon_state = "centcom"
@@ -264,8 +276,8 @@ proc/trigger_armed_response_team(var/force = 0)
 
 	return 1
 
-/*//debug verb
-client/verb/ResponseTeam()
+//debug verb (That is horribly coded, LEAVE THIS OFF UNLESS PRIVATELY TESTING. Seriously.
+/*client/verb/ResponseTeam()
 	set category = "Admin"
 	if(!send_emergency_team)
 		send_emergency_team = 1*/

code/game/turfs/space/space.dm

@@ -5,7 +5,7 @@
 
 	temperature = TCMB
 	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
-	heat_capacity = 700000
+//	heat_capacity = 700000 No.
 
 /turf/space/New()
 	if(!istype(src, /turf/space/transit))

code/game/verbs/ooc.dm

@@ -84,3 +84,65 @@ var/global/normal_ooc_colour = "#002eb8"
 	set desc = "Set to yellow for eye burning goodness."
 	set category = "Fun"
 	normal_ooc_colour = newColor
+
+
+/client/verb/looc(msg as text)
+	set name = "LOOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
+	set desc = "Local OOC, seen only by those in view."
+	set category = "OOC"
+
+	if(say_disabled)	//This is here to try to identify lag problems
+		usr << "\red Speech is currently admin-disabled."
+		return
+
+	if(!mob)	return
+	if(IsGuestKey(key))
+		src << "Guests may not use OOC."
+		return
+
+	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	if(!msg)	return
+
+	if(!(prefs.toggles & CHAT_OOC))
+		src << "\red You have OOC muted."
+		return
+
+	if(!holder)
+		if(!ooc_allowed)
+			src << "\red OOC is globally muted"
+			return
+		if(!dooc_allowed && (mob.stat == DEAD))
+			usr << "\red OOC for dead mobs has been turned off."
+			return
+		if(prefs.muted & MUTE_OOC)
+			src << "\red You cannot use OOC (muted)."
+			return
+		if(handle_spam_prevention(msg,MUTE_OOC))
+			return
+		if(findtext(msg, "byond://"))
+			src << "<B>Advertising other servers is not allowed.</B>"
+			log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
+			message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
+			return
+
+	log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
+
+	for(var/mob/M in hearers())
+		if(!M.client)
+			continue
+		var/client/C = M.client
+		if (C in admins)
+			continue //they are handled after that
+
+		if(C.prefs.toggles & CHAT_OOC)
+			var/display_name = src.key
+			if(holder)
+				if(holder.fakekey)
+					if(C.holder)
+						display_name = "[holder.fakekey]/([src.key])"
+					else
+						display_name = holder.fakekey
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
+	for(var/client/C in admins)
+		if(C.prefs.toggles & CHAT_OOC)
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"

code/global.dm

@@ -133,6 +133,7 @@ var/list/tdomeadmin = list()
 var/list/prisonsecuritywarp = list()	//prison security goes to these
 var/list/prisonwarped = list()	//list of players already warped
 var/list/blobstart = list()
+var/list/ninjastart = list()
 //	list/traitors = list()	//traitor list
 var/list/cardinal = list( NORTH, SOUTH, EAST, WEST )
 var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)

code/modules/DetectiveWork/scanner.dm

@@ -34,9 +34,11 @@
 	attack(mob/living/carbon/human/M as mob, mob/user as mob)
 		if (!ishuman(M))
 			user << "\red [M] is not human and cannot have the fingerprints."
+			flick("forensic0",src)
 			return 0
 		if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
 			user << "\blue No fingerprints found on [M]"
+			flick("forensic0",src)
 			return 0
 		else
 			if (src.amount < 1)
@@ -71,6 +73,7 @@
 			return
 		if(istype(A,/obj/item/weapon/f_card))
 			user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
+			flick("forensic0",src)
 			return
 
 		add_fingerprint(user)
@@ -81,6 +84,7 @@
 			if(!isnull(A.blood_DNA))
 				for(var/blood in A.blood_DNA)
 					user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
+					flick("forensic2",src)
 			return
 
 		//General
@@ -88,10 +92,12 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
 			"You hear a faint hum of electrical equipment.")
+			flick("forensic0",src)
 			return 0
 
 		if(add_data(A))
 			user << "\blue Object already in internal memory. Consolidating data..."
+			flick("forensic2",src)
 			return
 
 
@@ -116,6 +122,7 @@
 		//FIBERS
 		if(A.suit_fibers)
 			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+			flick("forensic2",src)
 
 		//Blood
 		if (A.blood_DNA)
@@ -127,11 +134,13 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"You finish scanning \the [A].",\
 			"You hear a faint hum of electrical equipment.")
+			flick("forensic2",src)
 			return 0
 		else
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]\n[user.gender == MALE ? "He" : "She"] seems to perk up slightly at the readout." ,\
 			"The results of the scan pique your interest.",\
 			"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
+			flick("forensic2",src)
 			return 0
 		return
 

code/modules/admin/admin_verbs.dm

@@ -67,7 +67,11 @@ var/list/admin_verbs_admin = list(
 	/client/proc/toggledebuglogs,
 	/datum/admins/proc/show_skills,
 	/client/proc/check_customitem_activity,
-	///client/proc/response_team
+	/client/proc/man_up,
+	/client/proc/global_man_up
+	/* Currently unticked.
+	/client/proc/response_team
+	*/
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -647,7 +651,7 @@ var/list/admin_verbs_mod = list(
 	if(!istype(M, /mob/living/carbon/human))
 		usr << "\red You can only do this to humans!"
 		return
-	switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Vox and Tajaran can result in unintended consequences.",,"Yes","No"))
+	switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Vox, Kida, and Tajara can result in unintended consequences.",,"Yes","No"))
 		if("No")
 			return
 	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
@@ -736,4 +740,28 @@ var/list/admin_verbs_mod = list(
 	if (prefs.toggles & CHAT_DEBUGLOGS)
 		usr << "You now will get debug log messages"
 	else
-		usr << "You now won't get debug log messages"
+		usr << "You now won't get debug log messages"
+
+
+/client/proc/man_up(mob/T as mob in mob_list)
+	set category = "Fun"
+	set name = "Man Up"
+	set desc = "Tells mob to man up and deal with it."
+
+	T << "<span class='notice'><b><font size=3>Man up and deal with it.</font></b></span>"
+	T << "<span class='notice'>Move on.</span>"
+
+	log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.")
+	message_admins("\blue [key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1)
+
+/client/proc/global_man_up()
+	set category = "Fun"
+	set name = "Man Up Global"
+	set desc = "Tells everyone to man up and deal with it."
+
+	for (var/mob/T as mob in mob_list)
+		T << "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>"
+		T << 'sound/voice/ManUp1.ogg'
+
+	log_admin("[key_name(usr)] told everyone to man up and deal with it.")
+	message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)

code/modules/admin/player_panel.dm

@@ -469,6 +469,20 @@
 					dat += "<tr><td><i>Wizard not found!</i></td></tr>"
 			dat += "</table>"
 
+		/*
+		if(ticker.mode.ninjas.len > 0)
+			dat += "<br><table cellspacing=5><tr><td><B>Ninjas</B></td><td></td><td></td></tr>"
+			for(var/datum/mind/ninja in ticker.mode.ninjas)
+				var/mob/M = ninja.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
+					dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
+				else
+					dat += "<tr><td><i>Ninja not found!</i></td></tr>"
+			dat += "</table>"
+		*/
+
 		if(ticker.mode.cult.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Cultists</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.cult)

code/modules/admin/topic.dm

@@ -11,31 +11,31 @@
 			if("1")
 				log_admin("[key_name(usr)] has spawned a traitor.")
 				if(!src.makeTraitors())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("2")
 				log_admin("[key_name(usr)] has spawned a changeling.")
 				if(!src.makeChanglings())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("3")
 				log_admin("[key_name(usr)] has spawned revolutionaries.")
 				if(!src.makeRevs())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("4")
 				log_admin("[key_name(usr)] has spawned a cultists.")
 				if(!src.makeCult())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("5")
 				log_admin("[key_name(usr)] has spawned a malf AI.")
 				if(!src.makeMalfAImode())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("6")
 				log_admin("[key_name(usr)] has spawned a wizard.")
 				if(!src.makeWizard())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("7")
 				log_admin("[key_name(usr)] has spawned a nuke team.")
 				if(!src.makeNukeTeam())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("8")
 				log_admin("[key_name(usr)] has spawned a ninja.")
 				src.makeSpaceNinja()
@@ -44,8 +44,10 @@
 				src.makeAliens()
 			if("10")
 				log_admin("[key_name(usr)] has spawned a death squad.")
-				if(!src.makeDeathsquad())
-					usr << "\red Unfortunatly there were no candidates available"
+			if("11")
+				log_admin("[key_name(usr)] has spawned vox raiders.")
+				if(!src.makeVoxRaiders())
+					usr << "\red Unfortunately there weren't enough candidates available."
 	else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"])
 		var/adminckey = href_list["dbsearchadmin"]
 		var/playerckey = href_list["dbsearchckey"]

code/modules/admin/verbs/debug.dm

@@ -551,7 +551,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		"blue wizard",
 		"red wizard",
 		"marisa wizard",
-		"emergency rescue team",
+		"emergency response team",
 		"nanotrasen representative",
 		"nanotrasen officer",
 		"nanotrasen captain"
@@ -817,7 +817,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.registered_name = M.real_name
 			M.equip_if_possible(W, slot_wear_id)
 
-		if("emergency rescue team")
+		if("emergency response team")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves)
@@ -831,7 +831,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.icon_state = "centcom"
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
-			W.assignment = "Emergency Rescue Team"
+			W.assignment = "Emergency Response Team"
 			W.registered_name = M.real_name
 			M.equip_to_slot_or_del(W, slot_wear_id)
 

code/modules/admin/verbs/one_click_antag.dm

@@ -17,6 +17,7 @@ client/proc/one_click_antag()
 		<a href='?src=\ref[src];makeAntag=4'>Make Cult</a><br>
 		<a href='?src=\ref[src];makeAntag=5'>Make Malf AI</a><br>
 		<a href='?src=\ref[src];makeAntag=6'>Make Wizard (Requires Ghosts)</a><br>
+		<a href='?src=\ref[src];makeAntag=11'>Make Vox Raiders (Requires Ghosts)</a><br>
 		"}
 /* These dont work just yet
 	Ninja, aliens and deathsquad I have not looked into yet
@@ -429,4 +430,94 @@ client/proc/one_click_antag()
 	ticker.mode.traitors += new_syndicate_commando.mind
 	new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected)
 
-	return new_syndicate_commando
+	return new_syndicate_commando
+
+/datum/admins/proc/makeVoxRaiders()
+
+	var/list/mob/dead/observer/candidates = list()
+	var/mob/dead/observer/theghost = null
+	var/time_passed = world.time
+	var/input = "Disregard shinies, acquire hardware."
+
+	var/leader_chosen = 0 //when the leader is chosen. The last person spawned.
+
+	//Generates a list of candidates from active ghosts. The admin picks which players to respawn as the vox.
+	for(var/mob/dead/observer/G in player_list)
+		spawn(0)
+			if(is_alien_whitelisted(src, "Vox") || !config.usealienwhitelist)
+				switch(alert(G,"Do you wish to be considered for a vox raiding party arriving on the station?","Please answer in 30 seconds!","Yes","No"))
+					if("Yes")
+						if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+							return
+						candidates += G
+					if("No")
+						return
+					else
+						return
+
+	sleep(300) //Debug.
+
+	for(var/mob/dead/observer/G in candidates)
+		if(!G.key)
+			candidates.Remove(G)
+
+	if(candidates.len)
+		var/max_raiders = 6
+		var/raiders = max_raiders
+		//Spawns vox raiders and equips them.
+		for (var/obj/effect/landmark/L in world)
+			if(L.name == "Response Team")
+				if(raiders<=0)
+					break
+
+				var/mob/living/carbon/human/new_vox = create_vox_raider(L, leader_chosen)
+
+				while((!theghost || !theghost.client) && candidates.len)
+					theghost = pick(candidates)
+					candidates.Remove(theghost)
+
+				if(!theghost)
+					del(new_vox)
+					break
+
+				new_vox.key = theghost.key
+				new_vox << "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red<B> [input]</B>"
+				new_vox << "\red Don't forget to turn on your nitrogen internals!"
+
+				raiders--
+			if(raiders > max_raiders)
+				return 0
+	else
+		return 0
+	return 1
+
+/datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0)
+
+	var/mob/living/carbon/human/new_vox = new(spawn_location.loc)
+
+	new_vox.gender = pick(MALE, FEMALE)
+	new_vox.h_style = "Short Vox Quills"
+	new_vox.regenerate_icons()
+
+	var/sounds = rand(2,10)
+	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" // Actually makes the vox! How about that.
+	new_vox.mind_initialize()
+	new_vox.mind.assigned_role = "MODE"
+	new_vox.mind.special_role = "Vox Raider"
+
+	ticker.mode.traitors += new_vox.mind
+	new_vox.equip_vox_raider()
+
+	return new_vox