Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo

baystation12.dme

@@ -679,6 +679,9 @@
 #include "code\modules\admin\verbs\possess.dm"
 #include "code\modules\admin\verbs\pray.dm"
 #include "code\modules\admin\verbs\randomverbs.dm"
+#include "code\modules\admin\verbs\SDQL.dm"
+#include "code\modules\admin\verbs\SDQL_2.dm"
+#include "code\modules\admin\verbs\SDQL_2_parser.dm"
 #include "code\modules\admin\verbs\striketeam.dm"
 #include "code\modules\admin\verbs\striketeam_syndicate.dm"
 #include "code\modules\admin\verbs\ticklag.dm"

code/ATMOSPHERICS/pipes.dm

@@ -161,7 +161,7 @@ obj/machinery/atmospherics/pipe
 		proc/burst()
 			src.visible_message("\red \bold [src] bursts!");
 			playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
-			var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+			var/datum/effect/effect/system/smoke_spread/smoke = new
 			smoke.set_up(1,0, src.loc, 0)
 			smoke.start()
 			del(src)

code/WorkInProgress/Cib/amorph/life.dm

@@ -148,7 +148,7 @@
 
 						if(!block)
 
-							for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+							for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 								if(smoke.reagents.total_volume)
 									smoke.reagents.reaction(src, INGEST)
 									spawn(5)

code/WorkInProgress/explosion_particles.dm

@@ -65,6 +65,6 @@
 	P.set_up(10,location)
 	P.start()
 	spawn(5)
-		var/datum/effect/effect/system/harmless_smoke_spread/S = new/datum/effect/effect/system/harmless_smoke_spread()
+		var/datum/effect/effect/system/smoke_spread/S = new/datum/effect/effect/system/smoke_spread()
 		S.set_up(5,0,location,null)
 		S.start()

code/ZAS/Fire.dm

@@ -11,8 +11,6 @@ Attach to transfer valve and open. BOOM.
 */
 
 
-
-
 //Some legacy definitions so fires can be started.
 atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	return null
@@ -21,160 +19,164 @@ atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed
 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
-	var/datum/gas_mixture/air_contents = return_air(1)
-	if(!air_contents)
+	if(fire_protection > world.time-300)
 		return 0
-
-  /*if(active_hotspot)
-		if(soh)
-			if(air_contents.toxins > 0.5 && air_contents.oxygen > 0.5)
-				if(active_hotspot.temperature < exposed_temperature)
-					active_hotspot.temperature = exposed_temperature
-				if(active_hotspot.volume < exposed_volume)
-					active_hotspot.volume = exposed_volume
-		return 1*/
-	var/igniting = 0
 	if(locate(/obj/fire) in src)
 		return 1
-	var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
+	var/datum/gas_mixture/air_contents = return_air()
+	if(!air_contents || exposed_temperature < PLASMA_MINIMUM_BURN_TEMPERATURE)
+		return 0
+
+	var/igniting = 0
 	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))
-			var/obj/fire/F = new(src,1000)
-			F.temperature = exposed_temperature
-			F.volume = CELL_VOLUME
 
-		//active_hotspot.just_spawned = (current_cycle < air_master.current_cycle)
-		//remove just_spawned protection if no longer processing this cell
+			new /obj/fire(src,1000)
 
 	return igniting
 
-obj
-	fire
-		//Icon for fire on turfs.
+/obj/fire
+	//Icon for fire on turfs.
 
-		anchored = 1
-		mouse_opacity = 0
+	anchored = 1
+	mouse_opacity = 0
 
-		//luminosity = 3
+	//luminosity = 3
 
-		icon = 'icons/effects/fire.dmi'
+	icon = 'icons/effects/fire.dmi'
+	icon_state = "1"
+
+	layer = TURF_LAYER
+
+	var/firelevel = 10000 //Calculated by gas_mixture.calculate_firelevel()
+
+/obj/fire/process()
+	. = 1
+
+	//get location and check if it is in a proper ZAS zone
+	var/turf/simulated/S = loc
+
+	if(!istype(S))
+		del src
+
+	if(!S.zone)
+		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_recombustability(liquid))
+		//del src
+		RemoveFire()
+
+	//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)
 
-		var
-			volume = CELL_VOLUME
-			temperature = PLASMA_MINIMUM_BURN_TEMPERATURE
-			firelevel = 10000 //Calculated by gas_mixture.calculate_firelevel()
-			archived_firelevel = 0
+	//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, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans!
+	for(var/atom/A in loc)
+		A.fire_act(air_contents, air_contents.temperature, air_contents.return_volume())
+	//spread
+	for(var/direction in cardinal)
+		if(S.air_check_directions&direction) //Grab all valid bordering tiles
 
-		process()
-			. = 1
+			var/turf/simulated/enemy_tile = get_step(S, direction)
 
-			if(firelevel > vsc.IgnitionLevel)
+			if(istype(enemy_tile))
+				var/datum/gas_mixture/acs = enemy_tile.return_air()
+				var/obj/effect/decal/cleanable/liquid_fuel/liq = locate() in enemy_tile
+				if(!acs) continue
+				if(!acs.check_recombustability(liq)) continue
+				//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
 
-				var/turf/simulated/floor/S = loc
-				if(!S.zone) del src //Cannot exist where zones are broken.
+				//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)
 
-				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
+	//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 ///////////////////////////////////////////////
 
-					var/datum/gas_mixture/flow = air_contents.remove_ratio(0.25)
-					//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.
+	if(flow)
 
-					firelevel = air_contents.calculate_firelevel(liquid)
+		if(flow.check_recombustability(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)
 
-					//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))
+			//burn baby burn!
 
-						for(var/direction in cardinal)
-							if(S.air_check_directions&direction) //Grab all valid bordering tiles
+			flow.zburn(liquid,1)
+		//merge the air back
+		S.assume_air(flow)
 
-								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"
-							else if(firelevel > 2.5)
-								icon_state = "2"
-							else
-								icon_state = "1"
-
-							//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)
-								del fuel
-
-						else
-
-							del src
+///////////////////////////////// FLOW HAS BEEN REMERGED /// feel free to delete the fire again from here on //////////////////////////////////////////////////////////////////
 
 
-						S.assume_air(flow) //Then put it back where you found it.
+/obj/fire/New(newLoc,fl)
+	..()
 
-					else
-						del src
-				else
-					del src
-			else
-				del src
+	if(!istype(loc, /turf))
+		del src
+
+	dir = pick(cardinal)
+	SetLuminosity(3)
+	firelevel = fl
+	air_master.active_hotspots.Add(src)
 
 
-			for(var/mob/living/carbon/human/M in loc)
-				M.FireBurn(temperature, min(max(0.1,firelevel / 20),10)) //Burn the humans!
+/obj/fire/Del()
+	if (istype(loc, /turf/simulated))
+		SetLuminosity(0)
 
+		loc = null
+	air_master.active_hotspots.Remove(src)
 
-		New(newLoc,fl)
-			..()
+	..()
 
-			if(!istype(loc, /turf))
-				del src
+/obj/fire/proc/RemoveFire()
+	if (istype(loc, /turf/simulated))
+		SetLuminosity(0)
+		loc = null
+	air_master.active_hotspots.Remove(src)
 
-			dir = pick(cardinal)
-			//sd_SetLuminosity(3,2,0)
-			firelevel = fl
-			air_master.active_hotspots.Add(src)
-
-		Del()
-			if (istype(loc, /turf/simulated))
-				//sd_SetLuminosity(0)
-
-				loc = null
-			air_master.active_hotspots.Remove(src)
-
-			..()
 
 
 turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again.
@@ -182,22 +184,19 @@ turf/proc/apply_fire_protection()
 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_FLASHPOINT && !reacting)
-		reacting = 1
+datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid, force_burn)
+	var/value = 0
 
-	if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE && reacting)
-		var
-			total_fuel = toxins
-			fuel_sources = 0 //We'll divide by this later so that fuel is consumed evenly.
-			datum/gas/volatile_fuel/fuel = locate() in trace_gases
+	if((temperature > PLASMA_MINIMUM_BURN_TEMPERATURE || force_burn) && check_recombustability(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
-			fuel_sources++
 
 		if(liquid)
 		//Liquid Fuel
@@ -205,72 +204,126 @@ datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid)
 				del liquid
 			else
 				total_fuel += liquid.amount
-				fuel_sources++
 
-			//Toxins
-		if(toxins > 0.3) fuel_sources++
+		//Calculate the firelevel.
+		var/firelevel = calculate_firelevel(liquid)
 
-		if(!fuel_sources) return 0 //If there's no fuel, there's no burn. Can't divide by zero anyway.
+		//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()
 
-		if(oxygen > 0.3)
+		//determine the amount of oxygen used
+		var/total_oxygen = min(oxygen, 2 * total_fuel)
 
-				//Calculate the firelevel.
-			var/firelevel = calculate_firelevel(liquid)
+		//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( 1700*log(0.4*firelevel + 1.23) , 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
 
-			//Consume some gas.
-			var/consumed_gas = min(oxygen,0.05*firelevel,total_fuel) / fuel_sources
+		//remove and add gasses as calculated
+		oxygen -= min(oxygen, total_oxygen * used_reactants_ratio )
 
-			oxygen = max(0,oxygen-consumed_gas)
+		toxins -= min(toxins, (toxins * used_fuel_ratio * used_reactants_ratio ) * 3)
+		if(toxins < 0)
+			toxins = 0
 
-			toxins = max(0,toxins-consumed_gas)
+		carbon_dioxide += max(2 * total_fuel, 0)
 
-			carbon_dioxide += consumed_gas*2
+		if(fuel)
+			fuel.moles -= (fuel.moles * used_fuel_ratio * used_reactants_ratio) * 5 //Fuel burns 5 times as quick
+			if(fuel.moles <= 0) del fuel
 
-			if(fuel)
-				fuel.moles -= consumed_gas
-				if(fuel.moles <= 0) del fuel
+		if(liquid)
+			liquid.amount -= (liquid.amount * used_fuel_ratio * used_reactants_ratio) * 5 // liquid fuel burns 5 times as quick
 
-			if(liquid)
-				liquid.amount -= consumed_gas
-				if(liquid.amount <= 0) del liquid
+			if(liquid.amount <= 0) del liquid
 
-			update_values()
-			return consumed_gas*fuel_sources
+		//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()
 
-	else
-		reacting = 0
+		update_values()
+		value = total_reactants * used_reactants_ratio
+	return value
+
+datum/gas_mixture/proc/check_recombustability(obj/effect/decal/cleanable/liquid_fuel/liquid)
+	//this is a copy proc to continue a fire after its been started.
+
+	var/datum/gas/volatile_fuel/fuel = locate() in trace_gases
+
+	if(oxygen && (toxins || fuel || liquid))
+		if(liquid)
+			return 1
+		if (toxins)
+			return 1
+		if(fuel)
+			return 1
 
 	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
+
+	if(oxygen && (toxins || fuel || liquid))
+		if(liquid)
+			return 1
+		if (toxins >= 0.7)
+			return 1
+		if(fuel && fuel.moles >= 1.4)
+			return 1
+
+	return 0
 
 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
-		liquid_concentration = 0
+	//Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
 
-		oxy_concentration = oxygen / volume
-		tox_concentration = toxins / volume
-		fuel_concentration = 0
+	var/datum/gas/volatile_fuel/fuel = locate() in trace_gases
+	var/total_fuel = 0
+	var/firelevel = 0
 
-	if(fuel) fuel_concentration = (fuel.moles) / volume
-	if(liquid) liquid_concentration = (liquid.amount*15) / volume
-	return (oxy_concentration + tox_concentration + liquid_concentration + fuel_concentration)*100
+	if(check_recombustability(liquid))
 
-/mob/living/carbon/human/proc/FireBurn(last_temperature, mx as num)
+		total_fuel += toxins
+
+		if(liquid)
+			total_fuel += liquid.amount
+
+		if(fuel)
+			total_fuel += fuel.moles
+
+		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/proc/FireBurn(var/firelevel, var/last_temperature, var/pressure)
+	var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+	apply_damage(2.5*mx, BURN)
+
+
+/mob/living/carbon/human/FireBurn(var/firelevel, var/last_temperature, var/pressure)
 	//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.
 
-	var
-		head_exposure = 1
-		chest_exposure = 1
-		groin_exposure = 1
-		legs_exposure = 1
-		arms_exposure = 1
+	var/head_exposure = 1
+	var/chest_exposure = 1
+	var/groin_exposure = 1
+	var/legs_exposure = 1
+	var/arms_exposure = 1
 
 	//Get heat transfer coefficients for clothing.
 
@@ -289,6 +342,8 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue
 				legs_exposure = 0
 			if(C.body_parts_covered & ARMS)
 				arms_exposure = 0
+	//minimize this for low-pressure enviroments
+	var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
 
 	//Always check these damage procs first if fire damage isn't working. They're probably what's wrong.
 
@@ -299,5 +354,3 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue
 	apply_damage(0.6*mx*legs_exposure, BURN, "r_leg", 0, 0, "Fire")
 	apply_damage(0.4*mx*arms_exposure, BURN, "l_arm", 0, 0, "Fire")
 	apply_damage(0.4*mx*arms_exposure, BURN, "r_arm", 0, 0, "Fire")
-
-	//flash_pain()

code/ZAS/Variable Settings.dm

@@ -1,7 +1,7 @@
 var/global/vs_control/vsc = new
 
 /vs_control
-/*	var/fire_consuption_rate = 0.25
+	var/fire_consuption_rate = 0.25
 	var/fire_consuption_rate_NAME = "Fire - Air Consumption Ratio"
 	var/fire_consuption_rate_DESC = "Ratio of air removed and combusted per tick."
 
@@ -12,7 +12,7 @@ var/global/vs_control/vsc = new
 	var/fire_fuel_energy_release = 397000
 	var/fire_fuel_energy_release_NAME = "Fire - Fuel energy release"
 	var/fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance"
-*/
+
 
 	var/IgnitionLevel = 0.5
 	var/IgnitionLevel_DESC = "Determines point at which fire can ignite"

code/ZAS/ZAS_Zones.dm

@@ -155,7 +155,10 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 
 //Updates the air_unsim var
 /zone/proc/UpdateUnsimAvg()
-	if(!unsim_air_needs_update)
+	if(!unsimulated_tiles || !unsimulated_tiles.len) //if we don't have any unsimulated tiles, we can't do much.
+		return
+
+	if(!unsim_air_needs_update && air_unsim) //if air_unsim doesn't exist, we need to create it even if we don't need an update.
 		return
 
 	unsim_air_needs_update = 0
@@ -516,7 +519,7 @@ proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
 
 	for(var/datum/gas/G in B.trace_gases)
 		var/datum/gas/H = locate(G.type) in A.trace_gases
-		if(H)
+		if(!H)
 			H = new G.type
 			A.trace_gases += H
 			var/G_avg = (G.moles*size) / (size+share_size)

code/_onclick/click.dm

@@ -55,7 +55,7 @@
 	if(modifiers["ctrl"])
 		CtrlClickOn(A)
 		return
-	
+
 	if(stat || paralysis || stunned || weakened)
 		return
 
@@ -65,6 +65,8 @@
 		return
 
 	if(istype(loc,/obj/mecha))
+		if(!locate(/turf) in list(A,A.loc)) // Prevents inventory from being drilled
+			return
 		var/obj/mecha/M = loc
 		return M.click_action(A,src)
 

code/_onclick/hud/screen_objects.dm

@@ -47,7 +47,7 @@
 		return 1
 	if(usr.next_move >= world.time)
 		return
-	usr.next_move = world.time + 10
+	usr.next_move = world.time + 6
 
 	if(usr.stat || usr.restrained() || usr.stunned || usr.lying)
 		return 1
@@ -86,6 +86,8 @@
 		return 1
 	if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
 		return 1
+	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+		return 1
 	if(master)
 		var/obj/item/I = usr.get_active_hand()
 		if(I)
@@ -207,6 +209,8 @@
 			usr.hud_used.hidden_inventory_update()
 
 		if("equip")
+			if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+				return 1
 			if(ishuman(usr))
 				var/mob/living/carbon/human/H = usr
 				H.quick_equip()
@@ -421,6 +425,8 @@
 		return 1
 	if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
 		return 1
+	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+		return 1
 	switch(name)
 		if("r_hand")
 			if(iscarbon(usr))

code/controllers/configuration.dm

@@ -28,7 +28,7 @@
 	var/vote_delay = 6000				// minimum time between voting sessions (deciseconds, 10 minute default)
 	var/vote_period = 600				// length of voting period (deciseconds, default 1 minute)
 	var/vote_autotransfer_initial = 108000 // Length of time before the first autotransfer vote is called
-	var/vote_autotransfer_interval = 3600 // length of time before next sequential autotransfer vote
+	var/vote_autotransfer_interval = 36000 // length of time before next sequential autotransfer vote
 	var/vote_no_default = 0				// vote does not default to nochange/norestart (tbi)
 	var/vote_no_dead = 0				// dead people can't vote (tbi)
 //	var/enable_authentication = 0		// goon authentication

code/controllers/voting.dm

@@ -48,6 +48,7 @@ datum/controller/vote
 
 	proc/autotransfer()
 		initiate_vote("crew_transfer","the server")
+		log_debug("The server has called an Autotransfer")
 
 
 	proc/reset()
@@ -206,14 +207,16 @@ datum/controller/vote
 						return 0
 					choices.Add(config.votable_modes)
 				if("crew_transfer")
-					if(check_rights(R_ADMIN) || check_rights(R_MOD))
+					if(check_rights(R_ADMIN|R_MOD, 0))
 						question = "End the shift?"
 						choices.Add("Initiate Crew Transfer", "Continue The Round")
 					else
 						if (get_security_level() == "red" || get_security_level() == "delta")
+							initiator_key << "The current alert status is too high to call for a crew transfer!"
 							return 0
 						if(ticker.current_state <= 2)
 							return 0
+							initiator_key << "The crew transfer button has been disabled!"
 						question = "End the shift?"
 						choices.Add("Initiate Crew Transfer", "Continue The Round")
 				if("custom")

code/datums/spell.dm

@@ -173,11 +173,11 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			sparks.start()
 		if(smoke_spread)
 			if(smoke_spread == 1)
-				var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+				var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
 			else if(smoke_spread == 2)
-				var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
+				var/datum/effect/effect/system/smoke_spread/bad/smoke = new /datum/effect/effect/system/smoke_spread/bad()
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
 

code/game/area/areas.dm

@@ -179,18 +179,23 @@
 /area/proc/updateicon()
 	if ((fire || eject || party) && ((!requires_power)?(!requires_power):power_environ))//If it doesn't require power, can still activate this proc.
 		if(fire && !eject && !party)
-			icon_state = "blue"
+			icon_state = "red"
+			blend_mode = BLEND_MULTIPLY
 		/*else if(atmosalm && !fire && !eject && !party)
 			icon_state = "bluenew"*/
 		else if(!fire && eject && !party)
 			icon_state = "red"
+			blend_mode = BLEND_MULTIPLY
 		else if(party && !fire && !eject)
 			icon_state = "party"
+			blend_mode = BLEND_MULTIPLY
 		else
 			icon_state = "blue-red"
+			blend_mode = BLEND_MULTIPLY
 	else
 	//	new lighting behaviour with obj lights
 		icon_state = null
+		blend_mode = BLEND_DEFAULT
 
 
 /*

code/game/gamemodes/events/ninja_abilities.dm

@@ -57,7 +57,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 	if(!ninjacost(,2))
 		var/mob/living/carbon/human/U = affecting
 		U << "\blue There are <B>[s_bombs]</B> smoke bombs remaining."
-		var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
+		var/datum/effect/effect/system/smoke_spread/bad/smoke = new /datum/effect/effect/system/smoke_spread/bad()
 		smoke.set_up(10, 0, U.loc)
 		smoke.start()
 		playsound(U.loc, 'sound/effects/bamf.ogg', 50, 2)

code/game/gamemodes/gameticker.dm

@@ -40,8 +40,13 @@ var/global/datum/controller/gameticker/ticker
 
 /datum/controller/gameticker/proc/pregame()
 	login_music = pick(\
+	/*'sound/music/halloween/skeletons.ogg',\
+	'sound/music/halloween/halloween.ogg',\
+	'sound/music/halloween/ghosts.ogg'*/
 	'sound/music/space.ogg',\
 	'sound/music/traitor.ogg',\
+	'sound/music/title2.ogg',\
+	'sound/music/clouds.s3m',\
 	'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
 	do
 		pregame_timeleft = 180

code/game/machinery/Sleeper.dm

@@ -72,16 +72,16 @@
 				for(var/chemical in connected.available_chemicals)
 					dat += "[connected.available_chemicals[chemical]]: [occupant.reagents.get_reagent_amount(chemical)] units<br>"
 			dat += "<HR><A href='?src=\ref[src];refresh=1'>Refresh meter readings each second</A><BR>"
-			if(src.connected.beaker)
-				if(src.connected.filtering)
-					dat += "<HR><A href='?src=\ref[src];togglefilter=1'>Stop Dialysis</A><BR>"
-					dat += text("Output Beaker has [] units of free space remaining<BR><HR>", src.connected.beaker.reagents.maximum_volume - src.connected.beaker.reagents.total_volume)
-				else
-					dat += "<HR><A href='?src=\ref[src];togglefilter=1'>Start Dialysis</A><BR>"
-					dat += text("Output Beaker has [] units of free space remaining<BR><HR>", src.connected.beaker.reagents.maximum_volume - src.connected.beaker.reagents.total_volume)
-			else
-				dat += "<HR>No Dialysis Output Beaker is present.<BR><HR>"
-
+			if(src.connected.beaker)
+				if(src.connected.filtering)
+					dat += "<HR><A href='?src=\ref[src];togglefilter=1'>Stop Dialysis</A><BR>"
+					dat += text("Output Beaker has [] units of free space remaining<BR><HR>", src.connected.beaker.reagents.maximum_volume - src.connected.beaker.reagents.total_volume)
+				else
+					dat += "<HR><A href='?src=\ref[src];togglefilter=1'>Start Dialysis</A><BR>"
+					dat += text("Output Beaker has [] units of free space remaining<BR><HR>", src.connected.beaker.reagents.maximum_volume - src.connected.beaker.reagents.total_volume)
+			else
+				dat += "<HR>No Dialysis Output Beaker is present.<BR><HR>"
+
 			for(var/chemical in connected.available_chemicals)
 				dat += "Inject [connected.available_chemicals[chemical]]: "
 				for(var/amount in connected.amounts)
@@ -110,9 +110,9 @@
 						usr << "\red \b This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!"
 		if (href_list["refresh"])
 			src.updateUsrDialog()
-		if (href_list["togglefilter"])
-			src.connected.toggle_filter()
-			src.updateUsrDialog()
+		if (href_list["togglefilter"])
+			src.connected.toggle_filter()
+			src.updateUsrDialog()
 		src.add_fingerprint(usr)
 	return
 
@@ -143,15 +143,15 @@
 	density = 1
 	anchored = 1
 	var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
-	var/mob/living/carbon/human/occupant = null
+	var/mob/living/carbon/human/occupant = null
 	var/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "dermaline" = "Dermaline", "bicaridine" = "Bicaridine", "dexalin" = "Dexalin")
 	var/amounts = list(5, 10)
-	var/obj/item/weapon/reagent_containers/glass/beaker = null
-	var/filtering = 0
+	var/obj/item/weapon/reagent_containers/glass/beaker = null
+	var/filtering = 0
 
 	New()
 		..()
-		beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large()
+		beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large()
 		spawn( 5 )
 			if(orient == "RIGHT")
 				icon_state = "sleeper_0-r"
@@ -164,14 +164,14 @@
 
 
 	process()
-		if(filtering > 0)
-			if(beaker)
-				if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
-					src.occupant.vessel.trans_to(beaker, 1)
-					for(var/datum/reagent/x in src.occupant.reagents.reagent_list)
-//						world << "FILTERING CHEMS"
-						src.occupant.reagents.trans_to(beaker, 3)
-						src.occupant.vessel.trans_to(beaker, 1)
+		if(filtering > 0)
+			if(beaker)
+				if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
+					src.occupant.vessel.trans_to(beaker, 1)
+					for(var/datum/reagent/x in src.occupant.reagents.reagent_list)
+						if(x.volume > 20)
+							src.occupant.reagents.trans_id_to(beaker, x.id, 2)
+							src.occupant.vessel.trans_to(beaker, 1)
 		src.updateDialog()
 		return
 
@@ -184,59 +184,59 @@
 			del(src)
 		return
 
-	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
-		if(istype(G, /obj/item/weapon/reagent_containers/glass))
-			if(!beaker)
-				beaker = G
-				user.drop_item()
-				G.loc = src
-				user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
-				return
-			else
-				user << "\red The sleeper has a beaker already."
+	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+		if(istype(G, /obj/item/weapon/reagent_containers/glass))
+			if(!beaker)
+				beaker = G
+				user.drop_item()
+				G.loc = src
+				user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
+				return
+			else
+				user << "\red The sleeper has a beaker already."
 				return
 
-		else if(istype(G, /obj/item/weapon/grab))
-			if(!ismob(G:affecting))
-				return
+		else if(istype(G, /obj/item/weapon/grab))
+			if(!ismob(G:affecting))
+				return
 
 			if(src.occupant)
 				user << "\blue <B>The sleeper is already occupied!</B>"
 				return
 
-			for(var/mob/living/carbon/slime/M in range(1,G:affecting))
-				if(M.Victim == G:affecting)
-					usr << "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head."
-					return
-
-			visible_message("[user] starts putting [G:affecting:name] into the sleeper.", 3)
-
-			if(do_after(user, 20))
-				if(src.occupant)
-					user << "\blue <B>The sleeper is already occupied!</B>"
-					return
-				if(!G || !G:affecting) return
-				var/mob/M = G:affecting
-				if(M.client)
-					M.client.perspective = EYE_PERSPECTIVE
-					M.client.eye = src
-				M.loc = src
-				src.occupant = M
-				src.icon_state = "sleeper_1"
-				if(orient == "RIGHT")
-					icon_state = "sleeper_1-r"
-
-				M << "\blue <b>You feel cool air surround you. You go numb as your senses turn inward.</b>"
-
-				src.add_fingerprint(user)
-				del(G)
+			for(var/mob/living/carbon/slime/M in range(1,G:affecting))
+				if(M.Victim == G:affecting)
+					usr << "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head."
+					return
+
+			visible_message("[user] starts putting [G:affecting:name] into the sleeper.", 3)
+
+			if(do_after(user, 20))
+				if(src.occupant)
+					user << "\blue <B>The sleeper is already occupied!</B>"
+					return
+				if(!G || !G:affecting) return
+				var/mob/M = G:affecting
+				if(M.client)
+					M.client.perspective = EYE_PERSPECTIVE
+					M.client.eye = src
+				M.loc = src
+				src.occupant = M
+				src.icon_state = "sleeper_1"
+				if(orient == "RIGHT")
+					icon_state = "sleeper_1-r"
+
+				M << "\blue <b>You feel cool air surround you. You go numb as your senses turn inward.</b>"
+
+				src.add_fingerprint(user)
+				del(G)
 			return
 		return
 
 
 	ex_act(severity)
-		if(filtering)
-			toggle_filter()
+		if(filtering)
+			toggle_filter()
 		switch(severity)
 			if(1.0)
 				for(var/atom/movable/A as mob|obj in src)
@@ -260,8 +260,8 @@
 					return
 		return
 	emp_act(severity)
-		if(filtering)
-			toggle_filter()
+		if(filtering)
+			toggle_filter()
 		if(stat & (BROKEN|NOPOWER))
 			..(severity)
 			return
@@ -286,15 +286,15 @@
 		if (M:reagents.get_reagent_amount("inaprovaline") < 5)
 			M:reagents.add_reagent("inaprovaline", 5)
 		return
-	proc/toggle_filter()
-		if(filtering)
-			filtering = 0
-		else
-			filtering = 1
+	proc/toggle_filter()
+		if(filtering)
+			filtering = 0
+		else
+			filtering = 1
 
 	proc/go_out()
-		if(filtering)
-			toggle_filter()
+		if(filtering)
+			toggle_filter()
 		if(!src.occupant)
 			return
 		if(src.occupant.client)
@@ -337,10 +337,10 @@
 			user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "\blue " : "\red "), src.occupant.getFireLoss())
 			user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)"
 			user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5)
-			if(src.beaker)
-				user << text("\blue \t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
-			else
-				user << "\blue No Dialysis Output Beaker loaded."
+			if(src.beaker)
+				user << text("\blue \t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
+			else
+				user << "\blue No Dialysis Output Beaker loaded."
 		else
 			user << "\blue There is no one inside!"
 		return
@@ -359,19 +359,19 @@
 		add_fingerprint(usr)
 		return
 
-	verb/remove_beaker()
-		set name = "Remove Beaker"
-		set category = "Object"
-		set src in oview(1)
-		if(usr.stat != 0)
-			return
-		if(beaker)
-			filtering = 0
-			beaker.loc = usr.loc
-			beaker = null
-		add_fingerprint(usr)
-		return
-
+	verb/remove_beaker()
+		set name = "Remove Beaker"
+		set category = "Object"
+		set src in oview(1)
+		if(usr.stat != 0)
+			return
+		if(beaker)
+			filtering = 0
+			beaker.loc = usr.loc
+			beaker = null
+		add_fingerprint(usr)
+		return
+
 	verb/move_inside()
 		set name = "Enter Sleeper"
 		set category = "Object"
@@ -402,10 +402,10 @@
 			if(orient == "RIGHT")
 				icon_state = "sleeper_1-r"
 
-			usr << "\blue <b>You feel cool air surround you. You go numb as your senses turn inward.</b>"
-
+			usr << "\blue <b>You feel cool air surround you. You go numb as your senses turn inward.</b>"
+
 			for(var/obj/O in src)
 				del(O)
 			src.add_fingerprint(usr)
 			return
-		return
+		return

code/game/machinery/alarm.dm

@@ -184,7 +184,7 @@
 		var/datum/gas_mixture/gas
 		gas = location.remove_air(0.25*environment.total_moles)
 		var/heat_capacity = gas.heat_capacity()
-		var/energy_used = max( abs( heat_capacity*(gas.temperature - target_temperature) ), MAX_ENERGY_CHANGE)
+		var/energy_used = min( abs( heat_capacity*(gas.temperature - target_temperature) ), MAX_ENERGY_CHANGE)
 
 		//Use power.  Assuming that each power unit represents 1000 watts....
 		use_power(energy_used/1000, ENVIRON)

code/game/machinery/computer/camera.dm

@@ -200,4 +200,10 @@
 	name = "Engineering Cameras"
 	desc = "Used to monitor fires and breaches."
 	icon_state = "engineeringcameras"
-	network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
+	network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
+
+/obj/machinery/computer/security/nuclear
+	name = "Mission Monitor"
+	desc = "Used to access the built-in cameras in helmets."
+	icon_state = "syndicam"
+	network = list("NUKE")

code/game/machinery/computer/computer.dm

@@ -27,7 +27,7 @@
 	for(var/x in verbs)
 		verbs -= x
 	set_broken()
-	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+	var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 	smoke.set_up(5, 0, src)
 	smoke.start()
 	return

code/game/mecha/combat/marauder.dm

@@ -14,7 +14,7 @@
 	var/smoke = 5
 	var/smoke_ready = 1
 	var/smoke_cooldown = 100
-	var/datum/effect/effect/system/harmless_smoke_spread/smoke_system = new
+	var/datum/effect/effect/system/smoke_spread/smoke_system = new
 	operation_req_access = list(access_cent_specops)
 	wreckage = /obj/effect/decal/mecha_wreckage/marauder
 	add_req_access = 0

code/game/objects/effects/effect_system.dm

@@ -21,15 +21,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	flags = TABLEPASS
 	mouse_opacity = 0
 
-/obj/effect/effect/smoke
-	name = "smoke"
-	icon = 'icons/effects/water.dmi'
-	icon_state = "smoke"
-	opacity = 1
-	anchored = 0.0
-	mouse_opacity = 0
-	var/amount = 8.0
-
 /obj/effect/proc/delete()
 	loc = null
 	if(reagents)
@@ -222,196 +213,186 @@ steam.start() -- spawns the effect
 /////////////////////////////////////////////
 
 
-/obj/effect/effect/harmless_smoke
+/obj/effect/effect/smoke
 	name = "smoke"
 	icon_state = "smoke"
 	opacity = 1
 	anchored = 0.0
 	mouse_opacity = 0
 	var/amount = 6.0
+	var/time_to_live = 100
+
 	//Remove this bit to use the old smoke
 	icon = 'icons/effects/96x96.dmi'
 	pixel_x = -32
 	pixel_y = -32
 
-/obj/effect/effect/harmless_smoke/New()
+/obj/effect/effect/smoke/New()
 	..()
-	spawn (100)
+	spawn (time_to_live)
 		delete()
 	return
 
-/obj/effect/effect/harmless_smoke/Move()
+/obj/effect/effect/smoke/HasEntered(mob/living/carbon/M as mob )
 	..()
-	return
-
-/datum/effect/effect/system/harmless_smoke_spread
-	var/total_smoke = 0 // To stop it being spammed and lagging!
-	var/direction
-
-	set_up(n = 5, c = 0, loca, direct)
-		if(n > 10)
-			n = 10
-		number = n
-		cardinals = c
-		if(istype(loca, /turf/))
-			location = loca
-		else
-			location = get_turf(loca)
-		if(direct)
-			direction = direct
-
-
-	start()
-		var/i = 0
-		for(i=0, i<src.number, i++)
-			if(src.total_smoke > 20)
-				return
-			spawn(0)
-				if(holder)
-					src.location = get_turf(holder)
-				var/obj/effect/effect/harmless_smoke/smoke = new /obj/effect/effect/harmless_smoke(src.location)
-				src.total_smoke++
-				var/direction = src.direction
-				if(!direction)
-					if(src.cardinals)
-						direction = pick(cardinal)
-					else
-						direction = pick(alldirs)
-				for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
-					sleep(10)
-					step(smoke,direction)
-				spawn(75+rand(10,30))
-					smoke.delete()
-					src.total_smoke--
+	if(istype(M))
+		affect(M)
 
+/obj/effect/effect/smoke/proc/affect(var/mob/living/carbon/M)
+	if (istype(M))
+		return 0
+	if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
+		return 0
+	return 1
 
 /////////////////////////////////////////////
 // Bad smoke
 /////////////////////////////////////////////
 
-/obj/effect/effect/bad_smoke
-	name = "smoke"
-	icon_state = "smoke"
-	opacity = 1
-	anchored = 0.0
-	mouse_opacity = 0
-	var/amount = 6.0
-	//Remove this bit to use the old smoke
-	icon = 'icons/effects/96x96.dmi'
-	pixel_x = -32
-	pixel_y = -32
+/obj/effect/effect/smoke/bad
+	time_to_live = 200
 
-/obj/effect/effect/bad_smoke/New()
-	..()
-	spawn (200+rand(10,30))
-		delete()
-	return
-
-/obj/effect/effect/bad_smoke/Move()
+/obj/effect/effect/smoke/bad/Move()
 	..()
 	for(var/mob/living/carbon/M in get_turf(src))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
-		else
-			M.drop_item()
-			M.adjustOxyLoss(1)
-			if (M.coughedtime != 1)
-				M.coughedtime = 1
-				M.emote("cough")
-				spawn ( 20 )
-					M.coughedtime = 0
-	return
+		affect(M)
 
+/obj/effect/effect/smoke/bad/affect(var/mob/living/carbon/M)
+	if (!..())
+		return 0
+	M.drop_item()
+	M.adjustOxyLoss(1)
+	if (M.coughedtime != 1)
+		M.coughedtime = 1
+		M.emote("cough")
+		spawn ( 20 )
+			M.coughedtime = 0
 
-/obj/effect/effect/bad_smoke/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/effect/effect/smoke/bad/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0)) return 1
 	if(istype(mover, /obj/item/projectile/beam))
 		var/obj/item/projectile/beam/B = mover
 		B.damage = (B.damage/2)
 	return 1
+/////////////////////////////////////////////
+// Sleep smoke
+/////////////////////////////////////////////
 
+/obj/effect/effect/smoke/sleepy
 
-/obj/effect/effect/bad_smoke/HasEntered(mob/living/carbon/M as mob )
+/obj/effect/effect/smoke/sleepy/Move()
 	..()
-	if(istype(M, /mob/living/carbon))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
-			return
-		else
-			M.drop_item()
-			M.adjustOxyLoss(1)
-			if (M.coughedtime != 1)
-				M.coughedtime = 1
-				M.emote("cough")
-				spawn ( 20 )
-					M.coughedtime = 0
+	for(var/mob/living/carbon/M in get_turf(src))
+		affect(M)
+
+/obj/effect/effect/smoke/sleepy/affect(mob/living/carbon/M as mob )
+	if (!..())
+		return 0
+
+	M.drop_item()
+	M:sleeping += 1
+	if (M.coughedtime != 1)
+		M.coughedtime = 1
+		M.emote("cough")
+		spawn ( 20 )
+			M.coughedtime = 0
+/////////////////////////////////////////////
+// Mustard Gas
+/////////////////////////////////////////////
+
+
+/obj/effect/effect/smoke/mustard
+	name = "mustard gas"
+	icon_state = "mustard"
+
+/obj/effect/effect/smoke/mustard/Move()
+	..()
+	for(var/mob/living/carbon/human/R in get_turf(src))
+		affect(R)
+
+/obj/effect/effect/smoke/mustard/affect(var/mob/living/carbon/human/R)
+	if (!..())
+		return 0
+	if (R.wear_suit != null)
+		return 0
+
+	R.burn_skin(0.75)
+	if (R.coughedtime != 1)
+		R.coughedtime = 1
+		R.emote("gasp")
+		spawn (20)
+			R.coughedtime = 0
+	R.updatehealth()
 	return
 
-/datum/effect/effect/system/bad_smoke_spread
+/////////////////////////////////////////////
+// Smoke spread
+/////////////////////////////////////////////
+
+/datum/effect/effect/system/smoke_spread
 	var/total_smoke = 0 // To stop it being spammed and lagging!
 	var/direction
+	var/smoke_type = /obj/effect/effect/smoke
 
-	set_up(n = 5, c = 0, loca, direct)
-		if(n > 20)
-			n = 20
-		number = n
-		cardinals = c
-		if(istype(loca, /turf/))
-			location = loca
-		else
-			location = get_turf(loca)
-		if(direct)
-			direction = direct
+/datum/effect/effect/system/smoke_spread/set_up(n = 5, c = 0, loca, direct)
+	if(n > 10)
+		n = 10
+	number = n
+	cardinals = c
+	if(istype(loca, /turf/))
+		location = loca
+	else
+		location = get_turf(loca)
+	if(direct)
+		direction = direct
 
-	start()
-		var/i = 0
-		for(i=0, i<src.number, i++)
-			if(src.total_smoke > 20)
-				return
-			spawn(0)
-				if(holder)
-					src.location = get_turf(holder)
-				var/obj/effect/effect/bad_smoke/smoke = new /obj/effect/effect/bad_smoke(src.location)
-				src.total_smoke++
-				var/direction = src.direction
-				if(!direction)
-					if(src.cardinals)
-						direction = pick(cardinal)
-					else
-						direction = pick(alldirs)
-				for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
-					sleep(10)
-					step(smoke,direction)
-				spawn(150+rand(10,30))
-					smoke.delete()
-					src.total_smoke--
+/datum/effect/effect/system/smoke_spread/start()
+	var/i = 0
+	for(i=0, i<src.number, i++)
+		if(src.total_smoke > 20)
+			return
+		spawn(0)
+			if(holder)
+				src.location = get_turf(holder)
+			var/obj/effect/effect/smoke/smoke = new smoke_type(src.location)
+			src.total_smoke++
+			var/direction = src.direction
+			if(!direction)
+				if(src.cardinals)
+					direction = pick(cardinal)
+				else
+					direction = pick(alldirs)
+			for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
+				sleep(10)
+				step(smoke,direction)
+			spawn(smoke.time_to_live*0.75+rand(10,30))
+				if (smoke) smoke.delete()
+				src.total_smoke--
 
 
+/datum/effect/effect/system/smoke_spread/bad
+	smoke_type = /obj/effect/effect/smoke/bad
+
+/datum/effect/effect/system/smoke_spread/sleepy
+	smoke_type = /obj/effect/effect/smoke/sleepy
+
+
+/datum/effect/effect/system/smoke_spread/mustard
+	smoke_type = /obj/effect/effect/smoke/mustard
 /////////////////////////////////////////////
 // Chem smoke
 /////////////////////////////////////////////
-
-
-/obj/effect/effect/chem_smoke
-	name = "smoke"
-	opacity = 1
-	anchored = 0.0
-	mouse_opacity = 0
-	var/amount = 6.0
-
+/obj/effect/effect/smoke/chem
 	icon = 'icons/effects/chemsmoke.dmi'
-	pixel_x = -32
-	pixel_y = -32
 
-/obj/effect/effect/chem_smoke/New()
+/obj/effect/effect/smoke/chem/New()
 	..()
 	var/datum/reagents/R = new/datum/reagents(500)
 	reagents = R
 	R.my_atom = src
-
-	spawn (200+rand(10,30))
-		delete()
 	return
 
-/obj/effect/effect/chem_smoke/Move()
+/obj/effect/effect/smoke/chem/Move()
 	..()
 	for(var/atom/A in view(2, src))
 		if(reagents.has_reagent("radium")||reagents.has_reagent("uranium")||reagents.has_reagent("carbon")||reagents.has_reagent("thermite"))//Prevents unholy radium spam by reducing the number of 'greenglows' down to something reasonable -Sieve
@@ -422,15 +403,11 @@ steam.start() -- spawns the effect
 
 	return
 
-/obj/effect/effect/chem_smoke/HasEntered(mob/living/carbon/M as mob )
-	..()
+/obj/effect/effect/smoke/chem/affect(mob/living/carbon/M as mob )
 	reagents.reaction(M)
 
-	return
-
-/datum/effect/effect/system/chem_smoke_spread
-	var/total_smoke = 0 // To stop it being spammed and lagging!
-	var/direction
+/datum/effect/effect/system/smoke_spread/chem
+	smoke_type = /obj/effect/effect/smoke/chem
 	var/obj/chemholder
 
 	New()
@@ -487,7 +464,7 @@ steam.start() -- spawns the effect
 			spawn(0)
 				if(holder)
 					src.location = get_turf(holder)
-				var/obj/effect/effect/chem_smoke/smoke = new /obj/effect/effect/chem_smoke(src.location)
+				var/obj/effect/effect/smoke/chem/smoke = new /obj/effect/effect/smoke/chem(src.location)
 				src.total_smoke++
 				var/direction = src.direction
 				if(!direction)
@@ -513,189 +490,6 @@ steam.start() -- spawns the effect
 					smoke.delete()
 					src.total_smoke--
 
-
-
-/////////////////////////////////////////////
-// Sleep smoke
-/////////////////////////////////////////////
-
-/obj/effect/effect/sleep_smoke
-	name = "smoke"
-	icon_state = "smoke"
-	opacity = 1
-	anchored = 0.0
-	mouse_opacity = 0
-	var/amount = 6.0
-	//Remove this bit to use the old smoke
-	icon = 'icons/effects/96x96.dmi'
-	pixel_x = -32
-	pixel_y = -32
-
-/obj/effect/effect/sleep_smoke/New()
-	..()
-	spawn (200+rand(10,30))
-		delete()
-	return
-
-/obj/effect/effect/sleep_smoke/Move()
-	..()
-	for(var/mob/living/carbon/M in get_turf(src))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
-//		if (M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal))  // I'll work on it later
-		else
-			M.drop_item()
-			M:sleeping += 1
-			if (M.coughedtime != 1)
-				M.coughedtime = 1
-				M.emote("cough")
-				spawn ( 20 )
-					M.coughedtime = 0
-	return
-
-/obj/effect/effect/sleep_smoke/HasEntered(mob/living/carbon/M as mob )
-	..()
-	if(istype(M, /mob/living/carbon))
-		if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS))
-//		if (M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal)) // Work on it later
-			return
-		else
-			M.drop_item()
-			M:sleeping += 1
-			if (M.coughedtime != 1)
-				M.coughedtime = 1
-				M.emote("cough")
-				spawn ( 20 )
-					M.coughedtime = 0
-	return
-
-/datum/effect/effect/system/sleep_smoke_spread
-	var/total_smoke = 0 // To stop it being spammed and lagging!
-	var/direction
-
-	set_up(n = 5, c = 0, loca, direct)
-		if(n > 20)
-			n = 20
-		number = n
-		cardinals = c
-		if(istype(loca, /turf/))
-			location = loca
-		else
-			location = get_turf(loca)
-		if(direct)
-			direction = direct
-
-
-	start()
-		var/i = 0
-		for(i=0, i<src.number, i++)
-			if(src.total_smoke > 20)
-				return
-			spawn(0)
-				if(holder)
-					src.location = get_turf(holder)
-				var/obj/effect/effect/sleep_smoke/smoke = new /obj/effect/effect/sleep_smoke(src.location)
-				src.total_smoke++
-				var/direction = src.direction
-				if(!direction)
-					if(src.cardinals)
-						direction = pick(cardinal)
-					else
-						direction = pick(alldirs)
-				for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
-					sleep(10)
-					step(smoke,direction)
-				spawn(150+rand(10,30))
-					smoke.delete()
-					src.total_smoke--
-
-/////////////////////////////////////////////
-// Mustard Gas
-/////////////////////////////////////////////
-
-
-/obj/effect/effect/mustard_gas
-	name = "mustard gas"
-	icon_state = "mustard"
-	opacity = 1
-	anchored = 0.0
-	mouse_opacity = 0
-	var/amount = 6.0
-
-/obj/effect/effect/mustard_gas/New()
-	..()
-	spawn (100)
-		del(src)
-	return
-
-/obj/effect/effect/mustard_gas/Move()
-	..()
-	for(var/mob/living/carbon/human/R in get_turf(src))
-		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & MASKINTERNALS) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
-		else
-			R.burn_skin(0.75)
-			if (R.coughedtime != 1)
-				R.coughedtime = 1
-				R.emote("gasp")
-				spawn (20)
-					R.coughedtime = 0
-			R.updatehealth()
-	return
-
-/obj/effect/effect/mustard_gas/HasEntered(mob/living/carbon/human/R as mob )
-	..()
-	if (istype(R, /mob/living/carbon/human))
-		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & MASKINTERNALS) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
-			return
-		R.burn_skin(0.75)
-		if (R.coughedtime != 1)
-			R.coughedtime = 1
-			R.emote("gasp")
-			spawn (20)
-				R.coughedtime = 0
-		R.updatehealth()
-	return
-
-/datum/effect/effect/system/mustard_gas_spread
-	var/total_smoke = 0 // To stop it being spammed and lagging!
-	var/direction
-
-	set_up(n = 5, c = 0, loca, direct)
-		if(n > 20)
-			n = 20
-		number = n
-		cardinals = c
-		if(istype(loca, /turf/))
-			location = loca
-		else
-			location = get_turf(loca)
-		if(direct)
-			direction = direct
-
-	start()
-		var/i = 0
-		for(i=0, i<src.number, i++)
-			if(src.total_smoke > 20)
-				return
-			spawn(0)
-				if(holder)
-					src.location = get_turf(holder)
-				var/obj/effect/effect/mustard_gas/smoke = new /obj/effect/effect/mustard_gas(src.location)
-				src.total_smoke++
-				var/direction = src.direction
-				if(!direction)
-					if(src.cardinals)
-						direction = pick(cardinal)
-					else
-						direction = pick(alldirs)
-				for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
-					sleep(10)
-					step(smoke,direction)
-				spawn(100)
-					del(smoke)
-					src.total_smoke--
-
-
-
 /////////////////////////////////////////////
 //////// Attach an Ion trail to any object, that spawns when it moves (like for the jetpack)
 /// just pass in the object to attach it to in set_up

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -7,11 +7,11 @@
 	item_state = "flashbang"
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
-	var/datum/effect/effect/system/bad_smoke_spread/smoke
+	var/datum/effect/effect/system/smoke_spread/bad/smoke
 
 	New()
 		..()
-		src.smoke = new /datum/effect/effect/system/bad_smoke_spread
+		src.smoke = new /datum/effect/effect/system/smoke_spread/bad
 		src.smoke.attach(src)
 
 	prime()

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

@@ -50,7 +50,7 @@
 	if(!((user == loc || (in_range(src, user) && istype(src.loc, /turf)))))
 		return
 
-	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+	var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 	smoke.set_up(5, 0, user.loc)
 	smoke.attach(user)
 	smoke.start()

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

@@ -27,6 +27,9 @@
 	if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist
 		var/mob/M = usr
 
+		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+			return
+
 		if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
 			orient2hud(M)          // dunno why it wasn't before
 			if(M.s_active)
@@ -206,6 +209,8 @@
 				break
 		if(!ok)
 			if(!stop_messages)
+				if (istype(W, /obj/item/weapon/hand_labeler))
+					return 0
 				usr << "<span class='notice'>[src] cannot hold [W].</span>"
 			return 0
 
@@ -311,7 +316,7 @@
 		return 1 //Robots can't interact with storage items.
 
 	if(!can_be_inserted(W))
-		return 1
+		return 0
 
 	if(istype(W, /obj/item/weapon/tray))
 		var/obj/item/weapon/tray/T = W

code/game/objects/structures/tables_racks.dm

@@ -48,29 +48,30 @@
 
 
 /obj/structure/table/update_icon()
-	if(flipped)
-		var/type = 0
-		var/tabledirs = 0
-		for(var/direction in list(turn(dir,90), turn(dir,-90)) )
-			var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
-			if (T && T.flipped)
-				type++
-				tabledirs |= direction
-		var/base = "table"
-		if (istype(src, /obj/structure/table/woodentable))
-			base = "wood"
-		if (istype(src, /obj/structure/table/reinforced))
-			base = "rtable"
-
-		icon_state = "[base]flip[type]"
-		if (type==1)
-			if (tabledirs & turn(dir,90))
-				icon_state = icon_state+"-"
-			if (tabledirs & turn(dir,-90))
-				icon_state = icon_state+"+"
-		return 1
-
 	spawn(2) //So it properly updates when deleting
+
+		if(flipped)
+			var/type = 0
+			var/tabledirs = 0
+			for(var/direction in list(turn(dir,90), turn(dir,-90)) )
+				var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
+				if (T && T.flipped && T.dir == src.dir)
+					type++
+					tabledirs |= direction
+			var/base = "table"
+			if (istype(src, /obj/structure/table/woodentable))
+				base = "wood"
+			if (istype(src, /obj/structure/table/reinforced))
+				base = "rtable"
+
+			icon_state = "[base]flip[type]"
+			if (type==1)
+				if (tabledirs & turn(dir,90))
+					icon_state = icon_state+"-"
+				if (tabledirs & turn(dir,-90))
+					icon_state = icon_state+"+"
+			return 1
+
 		var/dir_sum = 0
 		for(var/direction in list(1,2,4,8,5,6,9,10))
 			var/skip_sum = 0
@@ -393,20 +394,19 @@
 	return
 
 /obj/structure/table/proc/straight_table_check(var/direction)
-	var/turf/left = get_step(src,turn(direction,90))
-	var/turf/right = get_step(src,turn(direction,-90))
-	var/turf/next = get_step(src,direction)
-	if(locate(/obj/structure/table,left) || locate(/obj/structure/table,right))
-		return 0
-	var/obj/structure/table/T = locate(/obj/structure/table, next)
+	var/obj/structure/table/T
+	for(var/angle in list(-90,90))
+		T = locate() in get_step(src.loc,turn(direction,angle))
+		if(T && !T.flipped)
+			return 0
+	T = locate() in get_step(src.loc,direction)
+	if (!T || T.flipped)
+		return 1
 	if (istype(T,/obj/structure/table/reinforced/))
 		var/obj/structure/table/reinforced/R = T
 		if (R.status == 2)
 			return 0
-	if (!T)
-		return 1
-	else
-		return T.straight_table_check(direction)
+	return T.straight_table_check(direction)
 
 /obj/structure/table/verb/do_flip()
 	set name = "Flip table"
@@ -423,21 +423,35 @@
 		usr.visible_message("<span class='warning'>[usr] flips \the [src]!</span>")
 		return
 
+/obj/structure/table/proc/unflipping_check(var/direction)
+	for(var/mob/M in oview(src,0))
+		return 0
+
+	var/list/L = list()
+	if(direction)
+		L.Add(direction)
+	else
+		L.Add(turn(src.dir,-90))
+		L.Add(turn(src.dir,90))
+	for(var/new_dir in L)
+		var/obj/structure/table/T = locate() in get_step(src.loc,new_dir)
+		if(T)
+			if(T.flipped && T.dir == src.dir && !T.unflipping_check(new_dir))
+				return 0
+	return 1
+
 /obj/structure/table/proc/do_put()
 	set name = "Put table back"
 	set desc = "Puts flipped table back"
 	set category = "Object"
 	set src in oview(1)
 
-	if (!unflip())
+	if (!unflipping_check())
 		usr << "<span class='notice'>It won't budge.</span>"
 		return
-
+	unflip()
 
 /obj/structure/table/proc/flip(var/direction)
-	if (flipped)
-		return 0
-
 	if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) )
 		return 0
 
@@ -456,8 +470,8 @@
 	flipped = 1
 	flags |= ON_BORDER
 	for(var/D in list(turn(direction, 90), turn(direction, -90)))
-		if(locate(/obj/structure/table,get_step(src,D)))
-			var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D))
+		var/obj/structure/table/T = locate() in get_step(src,D)
+		if(T && !T.flipped)
 			T.flip(direction)
 	update_icon()
 	update_adjacent()
@@ -465,16 +479,6 @@
 	return 1
 
 /obj/structure/table/proc/unflip()
-	if (!flipped)
-		return 0
-
-	var/can_flip = 1
-	for (var/mob/A in oview(src,0))//src.loc)
-		if (istype(A))
-			can_flip = 0
-	if (!can_flip)
-		return 0
-
 	verbs -=/obj/structure/table/proc/do_put
 	verbs +=/obj/structure/table/verb/do_flip
 
@@ -482,8 +486,8 @@
 	flipped = 0
 	flags &= ~ON_BORDER
 	for(var/D in list(turn(dir, 90), turn(dir, -90)))
-		if(locate(/obj/structure/table,get_step(src,D)))
-			var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D))
+		var/obj/structure/table/T = locate() in get_step(src.loc,D)
+		if(T && T.flipped && T.dir == src.dir)
 			T.unflip()
 	update_icon()
 	update_adjacent()
@@ -646,4 +650,4 @@
 		del(src)
 
 /obj/structure/rack/attack_tk() // no telehulk sorry
-	return
+	return

code/game/verbs/ooc.dm

@@ -46,6 +46,8 @@ var/global/normal_ooc_colour = "#002eb8"
 		display_colour = "#0099cc"	//light blue
 		if(holder.rights & R_MOD && !(holder.rights & R_ADMIN))
 			display_colour = "#184880"	//dark blue
+		if(holder.rights & R_DEBUG && !(holder.rights & R_ADMIN))
+			display_colour = "#1b521f"	//dark green
 		else if(holder.rights & R_ADMIN)
 			if(config.allow_admin_ooccolor)
 				display_colour = src.prefs.ooccolor

code/modules/admin/admin.dm

@@ -806,7 +806,7 @@ var/global/floorIsLava = 0
 	set desc="Delay the game start/end"
 	set name="Delay"
 
-	if(!check_rights(R_ADMIN))	return
+	if(!check_rights(R_SERVER))	return
 	if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
 		ticker.delay_end = !ticker.delay_end
 		log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")

code/modules/admin/admin_verbs.dm

@@ -139,7 +139,9 @@ var/list/admin_verbs_debug = list(
 	/client/proc/restart_controller,
 	/client/proc/enable_debug_verbs,
 	/client/proc/callproc,
-	/client/proc/toggledebuglogs
+	/client/proc/toggledebuglogs,
+	/client/proc/SDQL_query,
+	/client/proc/SDQL2_query
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,

code/modules/admin/verbs/SDQL.dm

@@ -0,0 +1,497 @@
+
+//Structured Datum Query Language. Basically SQL meets BYOND objects.
+
+//Note: For use in BS12, need text_starts_with proc, and to modify the action on select to use BS12's object edit command(s).
+
+/client/proc/SDQL_query(query_text as message)
+	set category = "Admin"
+	if(!check_rights(R_DEBUG))  //Shouldn't happen... but just to be safe.
+		message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!")
+		log_admin("Non-admin [usr.key] attempted to execute a SDQL query!")
+
+	var/list/query_list = SDQL_tokenize(query_text)
+
+	if(query_list.len < 2)
+		if(query_list.len > 0)
+			usr << "\red SDQL: Too few discrete tokens in query \"[query_text]\". Please check your syntax and try again."
+		return
+
+	if(!(lowertext(query_list[1]) in list("select", "delete", "update")))
+		usr << "\red SDQL: Unknown query type: \"[query_list[1]]\" in query \"[query_text]\". Please check your syntax and try again."
+		return
+
+	var/list/types = list()
+
+	var/i
+	for(i = 2; i <= query_list.len; i += 2)
+		types += query_list[i]
+
+		if(i + 1 >= query_list.len || query_list[i + 1] != ",")
+			break
+
+	i++
+
+	var/list/from = list()
+
+	if(i <= query_list.len)
+		if(lowertext(query_list[i]) in list("from", "in"))
+			for(i++; i <= query_list.len; i += 2)
+				from += query_list[i]
+
+				if(i + 1 >= query_list.len || query_list[i + 1] != ",")
+					break
+
+			i++
+
+	if(from.len < 1)
+		from += "world"
+
+	var/list/set_vars = list()
+
+	if(lowertext(query_list[1]) == "update")
+		if(i <= query_list.len && lowertext(query_list[i]) == "set")
+			for(i++; i <= query_list.len; i++)
+				if(i + 2 <= query_list.len && query_list[i + 1] == "=")
+					set_vars += query_list[i]
+					set_vars[query_list[i]] = query_list[i + 2]
+
+				else
+					usr << "\red SDQL: Invalid set parameter in query \"[query_text]\". Please check your syntax and try again."
+					return
+
+				i += 3
+
+				if(i >= query_list.len || query_list[i] != ",")
+					break
+
+		if(set_vars.len < 1)
+			usr << "\red SDQL: Invalid or missing set in query \"[query_text]\". Please check your syntax and try again."
+			return
+
+	var/list/where = list()
+
+	if(i <= query_list.len && lowertext(query_list[i]) == "where")
+		where = query_list.Copy(i + 1)
+
+	var/list/from_objs = list()
+	if("world" in from)
+		from_objs += world
+	else
+		for(var/f in from)
+			if(copytext(f, 1, 2) == "'" || copytext(f, 1, 2) == "\"")
+				from_objs += locate(copytext(f, 2, length(f)))
+			else if(copytext(f, 1, 2) != "/")
+				from_objs += locate(f)
+			else
+				var/f2 = text2path(f)
+				if(text_starts_with(f, "/mob"))
+					for(var/mob/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/turf/space"))
+					for(var/turf/space/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/turf/simulated"))
+					for(var/turf/simulated/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/turf/unsimulated"))
+					for(var/turf/unsimulated/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/turf"))
+					for(var/turf/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/area"))
+					for(var/area/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/obj/item"))
+					for(var/obj/item/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/obj/machinery"))
+					for(var/obj/machinery/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/obj"))
+					for(var/obj/m in world)
+						if(istype(m, f2))
+							from_objs += m
+
+				else if(text_starts_with(f, "/atom"))
+					for(var/atom/m in world)
+						if(istype(m, f2))
+							from_objs += m
+/*
+				else
+					for(var/datum/m in world)
+						if(istype(m, f2))
+							from_objs += m
+*/
+
+	var/list/objs = list()
+
+	for(var/from_obj in from_objs)
+		if("*" in types)
+			objs += from_obj:contents
+		else
+			for(var/f in types)
+				if(copytext(f, 1, 2) == "'" || copytext(f, 1, 2) == "\"")
+					objs += locate(copytext(f, 2, length(f))) in from_obj
+				else if(copytext(f, 1, 2) != "/")
+					objs += locate(f) in from_obj
+				else
+					var/f2 = text2path(f)
+					if(text_starts_with(f, "/mob"))
+						for(var/mob/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/turf/space"))
+						for(var/turf/space/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/turf/simulated"))
+						for(var/turf/simulated/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/turf/unsimulated"))
+						for(var/turf/unsimulated/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/turf"))
+						for(var/turf/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/area"))
+						for(var/area/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/obj/item"))
+						for(var/obj/item/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/obj/machinery"))
+						for(var/obj/machinery/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/obj"))
+						for(var/obj/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else if(text_starts_with(f, "/atom"))
+						for(var/atom/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+					else
+						for(var/datum/m in from_obj)
+							if(istype(m, f2))
+								objs += m
+
+
+	for(var/datum/t in objs)
+		var/currently_false = 0
+		for(i = 1, i - 1 < where.len, i++)
+			var/v = where[i++]
+			var/compare_op = where[i++]
+			if(!(compare_op in list("==", "=", "<>", "<", ">", "<=", ">=", "!=")))
+				usr << "\red SDQL: Unknown comparison operator [compare_op] in where clause following [v] in query \"[query_text]\". Please check your syntax and try again."
+				return
+
+			var/j
+			for(j = i, j <= where.len, j++)
+				if(lowertext(where[j]) in list("and", "or", ";"))
+					break
+
+			if(!currently_false)
+				var/value = SDQL_text2value(t, v)
+				var/result = SDQL_evaluate(t, where.Copy(i, j))
+
+				switch(compare_op)
+					if("=", "==")
+						currently_false = !(value == result)
+
+					if("!=", "<>")
+						currently_false = !(value != result)
+
+					if("<")
+						currently_false = !(value < result)
+
+					if(">")
+						currently_false = !(value > result)
+
+					if("<=")
+						currently_false = !(value <= result)
+
+					if(">=")
+						currently_false = !(value >= result)
+
+
+			if(j > where.len || lowertext(where[j]) == ";")
+				break
+			else if(lowertext(where[j]) == "or")
+				if(currently_false)
+					currently_false = 0
+				else
+					break
+
+			i = j
+
+		if(currently_false)
+			objs -= t
+
+
+
+	usr << "\blue SQDL Query: [query_text]"
+	message_admins("[usr] executed SDQL query: \"[query_text]\".")
+/*
+	for(var/t in types)
+		usr << "Type: [t]"
+
+	for(var/t in from)
+		usr << "From: [t]"
+
+	for(var/t in set_vars)
+		usr << "Set: [t] = [set_vars[t]]"
+
+	if(where.len)
+		var/where_str = ""
+		for(var/t in where)
+			where_str += "[t] "
+
+		usr << "Where: [where_str]"
+
+	usr << "From objects:"
+	for(var/datum/t in from_objs)
+		usr << t
+
+	usr << "Objects:"
+	for(var/datum/t in objs)
+		usr << t
+*/
+	switch(lowertext(query_list[1]))
+		if("delete")
+			for(var/datum/t in objs)
+				del t
+
+		if("update")
+			for(var/datum/t in objs)
+				objs[t] = list()
+				for(var/v in set_vars)
+					if(v in t.vars)
+						objs[t][v] = SDQL_text2value(t, set_vars[v])
+
+			for(var/datum/t in objs)
+				for(var/v in objs[t])
+					t.vars[v] = objs[t][v]
+
+		if("select")
+			var/text = ""
+			for(var/datum/t in objs)
+				if(istype(t, /atom))
+					var/atom/a = t
+
+					if(a.x)
+						text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t] at ([a.x], [a.y], [a.z])<br>"
+
+					else if(a.loc && a.loc.x)
+						text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t] in [a.loc] at ([a.loc.x], [a.loc.y], [a.loc.z])<br>"
+
+					else
+						text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t]<br>"
+
+				else
+					text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t]<br>"
+
+				//text += "[t]<br>"
+			usr << browse(text, "window=sdql_result")
+
+
+/client/Topic(href,href_list[],hsrc)
+	if(href_list["SDQL_select"])
+		debug_variables(locate(href_list["SDQL_select"]))
+
+	..()
+
+
+/proc/SDQL_evaluate(datum/object, list/equation)
+	if(equation.len == 0)
+		return null
+
+	else if(equation.len == 1)
+		return SDQL_text2value(object, equation[1])
+
+	else if(equation[1] == "!")
+		return !SDQL_evaluate(object, equation.Copy(2))
+
+	else if(equation[1] == "-")
+		return -SDQL_evaluate(object, equation.Copy(2))
+
+
+	else
+		usr << "\red SDQL: Sorry, equations not yet supported :("
+		return null
+
+
+/proc/SDQL_text2value(datum/object, text)
+	if(text2num(text) != null)
+		return text2num(text)
+	else if(text == "null")
+		return null
+	else if(copytext(text, 1, 2) == "'" || copytext(text, 1, 2) == "\"" )
+		return copytext(text, 2, length(text))
+	else if(copytext(text, 1, 2) == "/")
+		return text2path(text)
+	else
+		if(findtext(text, "."))
+			var/split = findtext(text, ".")
+			var/v = copytext(text, 1, split)
+
+			if((v in object.vars) && istype(object.vars[v], /datum))
+				return SDQL_text2value(object.vars[v], copytext(text, split + 1))
+			else
+				return null
+
+		else
+			if(text in object.vars)
+				return object.vars[text]
+			else
+				return null
+
+
+/proc/text_starts_with(text, start)
+	if(copytext(text, 1, length(start) + 1) == start)
+		return 1
+	else
+		return 0
+
+
+
+
+
+/proc/SDQL_tokenize(query_text)
+
+	var/list/whitespace = list(" ", "\n", "\t")
+	var/list/single = list("(", ")", ",", "+", "-")
+	var/list/multi = list(
+					"=" = list("", "="),
+					"<" = list("", "=", ">"),
+					">" = list("", "="),
+					"!" = list("", "="))
+
+	var/word = ""
+	var/list/query_list = list()
+	var/len = length(query_text)
+
+	for(var/i = 1, i <= len, i++)
+		var/char = copytext(query_text, i, i + 1)
+
+		if(char in whitespace)
+			if(word != "")
+				query_list += word
+				word = ""
+
+		else if(char in single)
+			if(word != "")
+				query_list += word
+				word = ""
+
+			query_list += char
+
+		else if(char in multi)
+			if(word != "")
+				query_list += word
+				word = ""
+
+			var/char2 = copytext(query_text, i + 1, i + 2)
+
+			if(char2 in multi[char])
+				query_list += "[char][char2]"
+				i++
+
+			else
+				query_list += char
+
+		else if(char == "'")
+			if(word != "")
+				usr << "\red SDQL: You have an error in your SDQL syntax, unexpected ' in query: \"<font color=gray>[query_text]</font>\" following \"<font color=gray>[word]</font>\". Please check your syntax, and try again."
+				return null
+
+			word = "'"
+
+			for(i++, i <= len, i++)
+				char = copytext(query_text, i, i + 1)
+
+				if(char == "'")
+					if(copytext(query_text, i + 1, i + 2) == "'")
+						word += "'"
+						i++
+
+					else
+						break
+
+				else
+					word += char
+
+			if(i > len)
+				usr << "\red SDQL: You have an error in your SDQL syntax, unmatched ' in query: \"<font color=gray>[query_text]</font>\". Please check your syntax, and try again."
+				return null
+
+			query_list += "[word]'"
+			word = ""
+
+		else if(char == "\"")
+			if(word != "")
+				usr << "\red SDQL: You have an error in your SDQL syntax, unexpected \" in query: \"<font color=gray>[query_text]</font>\" following \"<font color=gray>[word]</font>\". Please check your syntax, and try again."
+				return null
+
+			word = "\""
+
+			for(i++, i <= len, i++)
+				char = copytext(query_text, i, i + 1)
+
+				if(char == "\"")
+					if(copytext(query_text, i + 1, i + 2) == "'")
+						word += "\""
+						i++
+
+					else
+						break
+
+				else
+					word += char
+
+			if(i > len)
+				usr << "\red SDQL: You have an error in your SDQL syntax, unmatched \" in query: \"<font color=gray>[query_text]</font>\". Please check your syntax, and try again."
+				return null
+
+			query_list += "[word]\""
+			word = ""
+
+		else
+			word += char
+
+	if(word != "")
+		query_list += word
+
+	return query_list

code/modules/admin/verbs/SDQL_2.dm

@@ -0,0 +1,426 @@
+
+
+/client/proc/SDQL2_query(query_text as message)
+	set category = "Admin"
+	if(!check_rights(R_DEBUG))  //Shouldn't happen... but just to be safe.
+		message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!")
+		log_admin("Non-admin [usr.key] attempted to execute a SDQL query!")
+
+	if(!query_text || length(query_text) < 1)
+		return
+
+	//world << query_text
+
+	var/list/query_list = SDQL2_tokenize(query_text)
+
+	if(!query_list || query_list.len < 1)
+		return
+
+	var/list/query_tree = SDQL_parse(query_list)
+
+	if(query_tree.len < 1)
+		return
+
+	var/list/from_objs = list()
+	var/list/select_types = list()
+
+	switch(query_tree[1])
+		if("explain")
+			SDQL_testout(query_tree["explain"])
+			return
+
+		if("call")
+			if("on" in query_tree)
+				select_types = query_tree["on"]
+			else
+				return
+
+		if("select", "delete", "update")
+			select_types = query_tree[query_tree[1]]
+
+	from_objs = SDQL_from_objs(query_tree["from"])
+
+	var/list/objs = list()
+
+	for(var/type in select_types)
+		var/char = copytext(type, 1, 2)
+
+		if(char == "/" || char == "*")
+			for(var/from in from_objs)
+				objs += SDQL_get_all(type, from)
+
+		else if(char == "'" || char == "\"")
+			objs += locate(copytext(type, 2, length(type)))
+
+	if("where" in query_tree)
+		var/objs_temp = objs
+		objs = list()
+		for(var/datum/d in objs_temp)
+			if(SDQL_expression(d, query_tree["where"]))
+				objs += d
+
+	//usr << "Query: [query_text]"
+	message_admins("[usr] executed SDQL query: \"[query_text]\".")
+
+	switch(query_tree[1])
+		if("delete")
+			for(var/datum/d in objs)
+				del d
+
+		if("select")
+			var/text = ""
+			for(var/datum/t in objs)
+				if(istype(t, /atom))
+					var/atom/a = t
+
+					if(a.x)
+						text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t] at ([a.x], [a.y], [a.z])<br>"
+
+					else if(a.loc && a.loc.x)
+						text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t] in [a.loc] at ([a.loc.x], [a.loc.y], [a.loc.z])<br>"
+
+					else
+						text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t]<br>"
+
+				else
+					text += "<a href='?src=\ref[t];SDQL_select=\ref[t]'>\ref[t]</a>: [t]<br>"
+
+			usr << browse(text, "window=SDQL-result")
+
+		if("update")
+			if("set" in query_tree)
+				var/list/set_list = query_tree["set"]
+				for(var/datum/d in objs)
+					var/list/vals = list()
+					for(var/v in set_list)
+						if(v in d.vars)
+							vals += v
+							vals[v] = SDQL_expression(d, set_list[v])
+
+					if(istype(d, /turf))
+						for(var/v in vals)
+							if(v == "x" || v == "y" || v == "z")
+								continue
+
+							d.vars[v] = vals[v]
+
+					else
+						for(var/v in vals)
+							d.vars[v] = vals[v]
+
+
+
+
+
+/proc/SDQL_parse(list/query_list)
+	var/datum/SDQL_parser/parser = new(query_list)
+	var/list/query_tree = parser.parse()
+
+	del(parser)
+
+	return query_tree
+
+
+
+/proc/SDQL_testout(list/query_tree, indent = 0)
+	var/spaces = ""
+	for(var/s = 0, s < indent, s++)
+		spaces += "    "
+
+	for(var/item in query_tree)
+		if(istype(item, /list))
+			world << "[spaces]("
+			SDQL_testout(item, indent + 1)
+			world << "[spaces])"
+
+		else
+			world << "[spaces][item]"
+
+		if(!isnum(item) && query_tree[item])
+
+			if(istype(query_tree[item], /list))
+				world << "[spaces]    ("
+				SDQL_testout(query_tree[item], indent + 2)
+				world << "[spaces]    )"
+
+			else
+				world << "[spaces]    [query_tree[item]]"
+
+
+
+/proc/SDQL_from_objs(list/tree)
+	if("world" in tree)
+		return list(world)
+
+	var/list/out = list()
+
+	for(var/type in tree)
+		var/char = copytext(type, 1, 2)
+
+		if(char == "/")
+			out += SDQL_get_all(type, world)
+
+		else if(char == "'" || char == "\"")
+			out += locate(copytext(type, 2, length(type)))
+
+	return out
+
+
+/proc/SDQL_get_all(type, location)
+	var/list/out = list()
+
+	if(type == "*")
+		for(var/datum/d in location)
+			out += d
+
+		return out
+
+	type = text2path(type)
+
+	if(ispath(type, /mob))
+		for(var/mob/d in location)
+			if(istype(d, type))
+				out += d
+
+	else if(ispath(type, /turf))
+		for(var/turf/d in location)
+			if(istype(d, type))
+				out += d
+
+	else if(ispath(type, /obj))
+		for(var/obj/d in location)
+			if(istype(d, type))
+				out += d
+
+	else if(ispath(type, /area))
+		for(var/area/d in location)
+			if(istype(d, type))
+				out += d
+
+	else if(ispath(type, /atom))
+		for(var/atom/d in location)
+			if(istype(d, type))
+				out += d
+
+	else
+		for(var/datum/d in location)
+			if(istype(d, type))
+				out += d
+
+	return out
+
+
+/proc/SDQL_expression(datum/object, list/expression, start = 1)
+	var/result = 0
+	var/val
+
+	for(var/i = start, i <= expression.len, i++)
+		var/op = ""
+
+		if(i > start)
+			op = expression[i]
+			i++
+
+		var/list/ret = SDQL_value(object, expression, i)
+		val = ret["val"]
+		i = ret["i"]
+
+		if(op != "")
+			switch(op)
+				if("+")
+					result += val
+				if("-")
+					result -= val
+				if("*")
+					result *= val
+				if("/")
+					result /= val
+				if("&")
+					result &= val
+				if("|")
+					result |= val
+				if("^")
+					result ^= val
+				if("=", "==")
+					result = (result == val)
+				if("!=", "<>")
+					result = (result != val)
+				if("<")
+					result = (result < val)
+				if("<=")
+					result = (result <= val)
+				if(">")
+					result = (result > val)
+				if(">=")
+					result = (result >= val)
+				if("and", "&&")
+					result = (result && val)
+				if("or", "||")
+					result = (result || val)
+				else
+					usr << "\red SDQL2: Unknown op [op]"
+					result = null
+		else
+			result = val
+
+	return result
+
+/proc/SDQL_value(datum/object, list/expression, start = 1)
+	var/i = start
+	var/val = null
+
+	if(i > expression.len)
+		return list("val" = null, "i" = i)
+
+	if(istype(expression[i], /list))
+		val = SDQL_expression(object, expression[i])
+
+	else if(expression[i] == "!")
+		var/list/ret = SDQL_value(object, expression, i + 1)
+		val = !ret["val"]
+		i = ret["i"]
+
+	else if(expression[i] == "~")
+		var/list/ret = SDQL_value(object, expression, i + 1)
+		val = ~ret["val"]
+		i = ret["i"]
+
+	else if(expression[i] == "-")
+		var/list/ret = SDQL_value(object, expression, i + 1)
+		val = -ret["val"]
+		i = ret["i"]
+
+	else if(expression[i] == "null")
+		val = null
+
+	else if(isnum(expression[i]))
+		val = expression[i]
+
+	else if(copytext(expression[i], 1, 2) in list("'", "\""))
+		val = copytext(expression[i], 2, length(expression[i]))
+
+	else
+		val = SDQL_var(object, expression, i)
+		i = expression.len
+
+	return list("val" = val, "i" = i)
+
+/proc/SDQL_var(datum/object, list/expression, start = 1)
+
+	if(expression[start] in object.vars)
+
+		if(start < expression.len && expression[start + 1] == ".")
+			return SDQL_var(object.vars[expression[start]], expression[start + 2])
+
+		else
+			return object.vars[expression[start]]
+
+	else
+		return null
+
+/proc/SDQL2_tokenize(query_text)
+
+	var/list/whitespace = list(" ", "\n", "\t")
+	var/list/single = list("(", ")", ",", "+", "-", ".")
+	var/list/multi = list(
+					"=" = list("", "="),
+					"<" = list("", "=", ">"),
+					">" = list("", "="),
+					"!" = list("", "="))
+
+	var/word = ""
+	var/list/query_list = list()
+	var/len = length(query_text)
+
+	for(var/i = 1, i <= len, i++)
+		var/char = copytext(query_text, i, i + 1)
+
+		if(char in whitespace)
+			if(word != "")
+				query_list += word
+				word = ""
+
+		else if(char in single)
+			if(word != "")
+				query_list += word
+				word = ""
+
+			query_list += char
+
+		else if(char in multi)
+			if(word != "")
+				query_list += word
+				word = ""
+
+			var/char2 = copytext(query_text, i + 1, i + 2)
+
+			if(char2 in multi[char])
+				query_list += "[char][char2]"
+				i++
+
+			else
+				query_list += char
+
+		else if(char == "'")
+			if(word != "")
+				usr << "\red SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"<font color=gray>[query_text]</font>\" following \"<font color=gray>[word]</font>\". Please check your syntax, and try again."
+				return null
+
+			word = "'"
+
+			for(i++, i <= len, i++)
+				char = copytext(query_text, i, i + 1)
+
+				if(char == "'")
+					if(copytext(query_text, i + 1, i + 2) == "'")
+						word += "'"
+						i++
+
+					else
+						break
+
+				else
+					word += char
+
+			if(i > len)
+				usr << "\red SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"<font color=gray>[query_text]</font>\". Please check your syntax, and try again."
+				return null
+
+			query_list += "[word]'"
+			word = ""
+
+		else if(char == "\"")
+			if(word != "")
+				usr << "\red SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"<font color=gray>[query_text]</font>\" following \"<font color=gray>[word]</font>\". Please check your syntax, and try again."
+				return null
+
+			word = "\""
+
+			for(i++, i <= len, i++)
+				char = copytext(query_text, i, i + 1)
+
+				if(char == "\"")
+					if(copytext(query_text, i + 1, i + 2) == "'")
+						word += "\""
+						i++
+
+					else
+						break
+
+				else
+					word += char
+
+			if(i > len)
+				usr << "\red SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"<font color=gray>[query_text]</font>\". Please check your syntax, and try again."
+				return null
+
+			query_list += "[word]\""
+			word = ""
+
+		else
+			word += char
+
+	if(word != "")
+		query_list += word
+
+	return query_list

code/modules/admin/verbs/SDQL_2_parser.dm

@@ -0,0 +1,531 @@
+//I'm pretty sure that this is a recursive [s]descent[/s] ascent parser.
+
+
+
+//Spec
+
+//////////
+//
+//	query				:	select_query | delete_query | update_query | call_query | explain
+//	explain				:	'EXPLAIN' query
+//
+//	select_query		:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+//	delete_query		:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+//	update_query		:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
+//	call_query			:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
+//
+//	select_list			:	select_item [',' select_list]
+//	select_item			:	'*' | select_function | object_type
+//	select_function		:	count_function
+//	count_function		:	'COUNT' '(' '*' ')' | 'COUNT' '(' object_types ')'
+//
+//	from_list			:	from_item [',' from_list]
+//	from_item			:	'world' | object_type
+//
+//	call_function		:	<function name> ['(' [arguments] ')']
+//	arguments			:	expression [',' arguments]
+//
+//	object_type			:	<type path> | string
+//
+//	assignments			:	assignment, [',' assignments]
+//	assignment			:	<variable name> '=' expression
+//	variable			:	<variable name> | <variable name> '.' variable
+//
+//	bool_expression		:	expression comparitor expression  [bool_operator bool_expression]
+//	expression			:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
+//	unary_expression	:	unary_operator ( unary_expression | value | '(' expression ')' )
+//	comparitor			:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
+//	value				:	variable | string | number | 'null'
+//	unary_operator		:	'!' | '-' | '~'
+//	binary_operator		:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+//	bool_operator		:	'AND' | '&&' | 'OR' | '||'
+//
+//	string				:	''' <some text> ''' | '"' <some text > '"'
+//	number				:	<some digits>
+//
+//////////
+
+/datum/SDQL_parser
+	var/query_type
+	var/error = 0
+
+	var/list/query
+	var/list/tree
+
+	var/list/select_functions = list("count")
+	var/list/boolean_operators = list("and", "or", "&&", "||")
+	var/list/unary_operators = list("!", "-", "~")
+	var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^")
+	var/list/comparitors = list("=", "==", "!=", "<>", "<", "<=", ">", ">=")
+
+
+
+/datum/SDQL_parser/New(query_list)
+	query = query_list
+
+
+
+/datum/SDQL_parser/proc/parse_error(error_message)
+	error = 1
+	usr << "\red SQDL2 Parsing Error: [error_message]"
+	return query.len + 1
+
+/datum/SDQL_parser/proc/parse()
+	tree = list()
+	query(1, tree)
+
+	if(error)
+		return list()
+	else
+		return tree
+
+/datum/SDQL_parser/proc/token(i)
+	if(i <= query.len)
+		return query[i]
+
+	else
+		return null
+
+/datum/SDQL_parser/proc/tokens(i, num)
+	if(i + num <= query.len)
+		return query.Copy(i, i + num)
+
+	else
+		return null
+
+/datum/SDQL_parser/proc/tokenl(i)
+	return lowertext(token(i))
+
+
+
+/datum/SDQL_parser/proc
+
+//query:	select_query | delete_query | update_query
+	query(i, list/node)
+		query_type = tokenl(i)
+
+		switch(query_type)
+			if("select")
+				select_query(i, node)
+
+			if("delete")
+				delete_query(i, node)
+
+			if("update")
+				update_query(i, node)
+
+			if("call")
+				call_query(i, node)
+
+			if("explain")
+				node += "explain"
+				node["explain"] = list()
+				query(i + 1, node["explain"])
+
+
+//	select_query:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+	select_query(i, list/node)
+		var/list/select = list()
+		i = select_list(i + 1, select)
+
+		node += "select"
+		node["select"] = select
+
+		var/list/from = list()
+		if(tokenl(i) in list("from", "in"))
+			i = from_list(i + 1, from)
+		else
+			from += "world"
+
+		node += "from"
+		node["from"] = from
+
+		if(tokenl(i) == "where")
+			var/list/where = list()
+			i = bool_expression(i + 1, where)
+
+			node += "where"
+			node["where"] = where
+
+		return i
+
+
+//delete_query:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+	delete_query(i, list/node)
+		var/list/select = list()
+		i = select_list(i + 1, select)
+
+		node += "delete"
+		node["delete"] = select
+
+		var/list/from = list()
+		if(tokenl(i) in list("from", "in"))
+			i = from_list(i + 1, from)
+		else
+			from += "world"
+
+		node += "from"
+		node["from"] = from
+
+		if(tokenl(i) == "where")
+			var/list/where = list()
+			i = bool_expression(i + 1, where)
+
+			node += "where"
+			node["where"] = where
+
+		return i
+
+
+//update_query:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
+	update_query(i, list/node)
+		var/list/select = list()
+		i = select_list(i + 1, select)
+
+		node += "update"
+		node["update"] = select
+
+		var/list/from = list()
+		if(tokenl(i) in list("from", "in"))
+			i = from_list(i + 1, from)
+		else
+			from += "world"
+
+		node += "from"
+		node["from"] = from
+
+		if(tokenl(i) != "set")
+			i = parse_error("UPDATE has misplaced SET")
+
+		var/list/set_assignments = list()
+		i = assignments(i + 1, set_assignments)
+
+		node += "set"
+		node["set"] = set_assignments
+
+		if(tokenl(i) == "where")
+			var/list/where = list()
+			i = bool_expression(i + 1, where)
+
+			node += "where"
+			node["where"] = where
+
+		return i
+
+
+//call_query:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
+	call_query(i, list/node)
+		var/list/func = list()
+		i = call_function(i + 1, func)
+
+		node += "call"
+		node["call"] = func
+
+		if(tokenl(i) != "on")
+			return i
+
+		var/list/select = list()
+		i = select_list(i + 1, select)
+
+		node += "on"
+		node["on"] = select
+
+		var/list/from = list()
+		if(tokenl(i) in list("from", "in"))
+			i = from_list(i + 1, from)
+		else
+			from += "world"
+
+		node += "from"
+		node["from"] = from
+
+		if(tokenl(i) == "where")
+			var/list/where = list()
+			i = bool_expression(i + 1, where)
+
+			node += "where"
+			node["where"] = where
+
+		return i
+
+
+//select_list:	select_item [',' select_list]
+	select_list(i, list/node)
+		i = select_item(i, node)
+
+		if(token(i) == ",")
+			i = select_list(i + 1, node)
+
+		return i
+
+
+//from_list:	from_item [',' from_list]
+	from_list(i, list/node)
+		i = from_item(i, node)
+
+		if(token(i) == ",")
+			i = from_list(i + 1, node)
+
+		return i
+
+
+//assignments:	assignment, [',' assignments]
+	assignments(i, list/node)
+		i = assignment(i, node)
+
+		if(token(i) == ",")
+			i = assignments(i + 1, node)
+
+		return i
+
+
+//select_item:	'*' | select_function | object_type
+	select_item(i, list/node)
+
+		if(token(i) == "*")
+			node += "*"
+			i++
+
+		else if(tokenl(i) in select_functions)
+			i = select_function(i, node)
+
+		else
+			i = object_type(i, node)
+
+		return i
+
+
+//from_item:	'world' | object_type
+	from_item(i, list/node)
+
+		if(token(i) == "world")
+			node += "world"
+			i++
+
+		else
+			i = object_type(i, node)
+
+		return i
+
+
+//bool_expression:	expression [bool_operator bool_expression]
+	bool_expression(i, list/node)
+
+		var/list/bool = list()
+		i = expression(i, bool)
+
+		node[++node.len] = bool
+
+		if(tokenl(i) in boolean_operators)
+			i = bool_operator(i, node)
+			i = bool_expression(i, node)
+
+		return i
+
+
+//assignment:	<variable name> '=' expression
+	assignment(i, list/node)
+
+		node += token(i)
+
+		if(token(i + 1) == "=")
+			var/varname = token(i)
+			node[varname] = list()
+
+			i = expression(i + 2, node[varname])
+
+		else
+			parse_error("Assignment expected, but no = found")
+
+		return i
+
+
+//variable:	<variable name> | <variable name> '.' variable
+	variable(i, list/node)
+		var/list/L = list(token(i))
+		node[++node.len] = L
+
+		if(token(i + 1) == ".")
+			L += "."
+			i = variable(i + 2, L)
+
+		else
+			i++
+
+		return i
+
+
+//object_type:	<type path> | string
+	object_type(i, list/node)
+
+		if(copytext(token(i), 1, 2) == "/")
+			node += token(i)
+
+		else
+			i = string(i, node)
+
+		return i + 1
+
+
+//comparitor:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
+	comparitor(i, list/node)
+
+		if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
+			node += token(i)
+
+		else
+			parse_error("Unknown comparitor [token(i)]")
+
+		return i + 1
+
+
+//bool_operator:	'AND' | '&&' | 'OR' | '||'
+	bool_operator(i, list/node)
+
+		if(tokenl(i) in list("and", "or", "&&", "||"))
+			node += token(i)
+
+		else
+			parse_error("Unknown comparitor [token(i)]")
+
+		return i + 1
+
+
+//string:	''' <some text> ''' | '"' <some text > '"'
+	string(i, list/node)
+
+		if(copytext(token(i), 1, 2) in list("'", "\""))
+			node += token(i)
+
+		else
+			parse_error("Expected string but found '[token(i)]'")
+
+		return i + 1
+
+
+//call_function:	<function name> ['(' [arguments] ')']
+	call_function(i, list/node)
+
+		parse_error("Sorry, function calls aren't available yet")
+
+		return i
+
+
+//select_function:	count_function
+	select_function(i, list/node)
+
+		parse_error("Sorry, function calls aren't available yet")
+
+		return i
+
+
+//expression:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
+	expression(i, list/node)
+
+		if(token(i) in unary_operators)
+			i = unary_expression(i, node)
+
+		else if(token(i) == "(")
+			var/list/expr = list()
+
+			i = expression(i + 1, expr)
+
+			if(token(i) != ")")
+				parse_error("Missing ) at end of expression.")
+
+			else
+				i++
+
+			node[++node.len] = expr
+
+		else
+			i = value(i, node)
+
+		if(token(i) in binary_operators)
+			i = binary_operator(i, node)
+			i = expression(i, node)
+
+		else if(token(i) in comparitors)
+			i = binary_operator(i, node)
+
+			var/list/rhs = list()
+			i = expression(i, rhs)
+
+			node[++node.len] = rhs
+
+
+		return i
+
+
+//unary_expression:	unary_operator ( unary_expression | value | '(' expression ')' )
+	unary_expression(i, list/node)
+
+		if(token(i) in unary_operators)
+			var/list/unary_exp = list()
+
+			unary_exp += token(i)
+			i++
+
+			if(token(i) in unary_operators)
+				i = unary_expression(i, unary_exp)
+
+			else if(token(i) == "(")
+				var/list/expr = list()
+
+				i = expression(i + 1, expr)
+
+				if(token(i) != ")")
+					parse_error("Missing ) at end of expression.")
+
+				else
+					i++
+
+				unary_exp[++unary_exp.len] = expr
+
+			else
+				i = value(i, unary_exp)
+
+			node[++node.len] = unary_exp
+
+
+		else
+			parse_error("Expected unary operator but found '[token(i)]'")
+
+		return i
+
+
+//binary_operator:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+	binary_operator(i, list/node)
+
+		if(token(i) in (binary_operators + comparitors))
+			node += token(i)
+
+		else
+			parse_error("Unknown binary operator [token(i)]")
+
+		return i + 1
+
+
+//value:	variable | string | number | 'null'
+	value(i, list/node)
+
+		if(token(i) == "null")
+			node += "null"
+			i++
+
+		else if(isnum(text2num(token(i))))
+			node += text2num(token(i))
+			i++
+
+		else if(copytext(token(i), 1, 2) in list("'", "\""))
+			i = string(i, node)
+
+		else
+			i = variable(i, node)
+
+		return i
+
+
+
+
+/*EXPLAIN SELECT * WHERE 42 = 6 * 9 OR val = - 5 == 7*/

code/modules/admin/verbs/vox_raiders.dm

@@ -66,7 +66,7 @@ var/global/vox_tick = 1
 	C.registered_user = src
 	var/obj/item/weapon/storage/wallet/W = new(src)
 	W.handle_item_insertion(C)
-	spawn_money(rand(100,300)*5,W)
+	spawn_money(rand(50,150)*10,W)
 	equip_to_slot_or_del(W, slot_wear_id)
 
 	var/obj/item/weapon/implant/cortical/I = new(src)

code/modules/awaymissions/trigger.dm

@@ -31,11 +31,11 @@
 		s.start()
 
 	if(entersmoke)
-		var/datum/effect/effect/system/harmless_smoke_spread/s = new /datum/effect/effect/system/harmless_smoke_spread
+		var/datum/effect/effect/system/smoke_spread/s = new /datum/effect/effect/system/smoke_spread
 		s.set_up(4, 1, src, 0)
 		s.start()
 	if(exitsmoke)
-		var/datum/effect/effect/system/harmless_smoke_spread/s = new /datum/effect/effect/system/harmless_smoke_spread
+		var/datum/effect/effect/system/smoke_spread/s = new /datum/effect/effect/system/smoke_spread
 		s.set_up(4, 1, dest, 0)
 		s.start()
 

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

@@ -128,7 +128,7 @@
 					breath = loc.remove_air(breath_moles)
 
 					// Handle chem smoke effect  -- Doohl
-					for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+					for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 						if(smoke.reagents.total_volume)
 							smoke.reagents.reaction(src, INGEST)
 							spawn(5)

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

@@ -103,7 +103,7 @@
 					breath = loc.remove_air(breath_moles)
 
 					// Handle chem smoke effect  -- Doohl
-					for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+					for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 						if(smoke.reagents.total_volume)
 							smoke.reagents.reaction(src, INGEST)
 							spawn(5)

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

@@ -359,7 +359,7 @@
 
 					if(!block)
 
-						for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+						for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 							if(smoke.reagents.total_volume)
 								smoke.reagents.reaction(src, INGEST)
 								spawn(5)

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

@@ -250,7 +250,7 @@
 							block = 1
 
 					if(!block)
-						for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+						for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 							if(smoke.reagents.total_volume)
 								smoke.reagents.reaction(src, INGEST)
 								spawn(5)

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

@@ -80,7 +80,7 @@
 
 		//smoke, water and steam calms us down
 		var/calming = 0
-		var/list/calmers = list(/obj/effect/effect/chem_smoke, \
+		var/list/calmers = list(/obj/effect/effect/smoke/chem, \
 		/obj/effect/effect/water, \
 		/obj/effect/effect/foam, \
 		/obj/effect/effect/steam, \

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -76,7 +76,7 @@
 
 	New()
 		..()
-		var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+		var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 		smoke.set_up(5, 0, src.loc)
 		smoke.start()
 		visible_message("\red <B>The [src] warps in!</B>")

code/modules/mob/mob.dm

@@ -240,6 +240,8 @@ var/list/slot_equipment_priority = list( \
 	set category = "Object"
 	set src = usr
 
+	if(istype(loc,/obj/mecha)) return
+
 	if(hand)
 		var/obj/item/W = l_hand
 		if (W)

code/modules/organs/organ_external.dm

@@ -338,8 +338,9 @@ This function completely restores a damaged organ to perfect condition.
 
 	for(var/datum/wound/W in wounds)
 		// wounds can disappear after 10 minutes at the earliest
-		if(W.damage == 0 && W.created + 10 * 10 * 60 <= world.time)
+		if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
 			wounds -= W
+			continue
 			// let the GC handle the deletion of the wound
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
@@ -347,17 +348,14 @@ This function completely restores a damaged organ to perfect condition.
 			if(!owner.reagents.has_reagent("bicaridine"))	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
+
 			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)//Bicaridine slows Internal Bleeding
 			if(prob(1 * wound_update_accuracy))
 				owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
 
-		//overdose of bicaridine begins healing IB
-		if(owner.reagents.has_reagent("bicaridine") && (owner.reagents.get_reagent_amount("bicaridine") >= 30))
-			var/healinternal = 0.2
-			if(W.damage <= healinternal)
-				W.damage = 0
-			else
-				W.damage -= healinternal
+			//overdose of bicaridine begins healing IB
+			if(owner.reagents.get_reagent_amount("bicaridine") >= 30)
+				W.damage = max(0, W.damage - 0.2)
 
 		// slow healing
 		var/heal_amt = 0
@@ -417,7 +415,10 @@ This function completely restores a damaged organ to perfect condition.
 	var/n_is = damage_state_text()
 	if (n_is != damage_state)
 		damage_state = n_is
-		owner.update_body(1)
+		if(status & ORGAN_DESTROYED)
+			owner.update_body(1)
+		else
+			owner.UpdateDamageIcon(1)
 		return 1
 	return 0
 

code/modules/power/apc.dm

@@ -962,7 +962,7 @@
 				cell.corrupt()
 				src.malfhack = 1
 				update_icon()
-				var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+				var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 				smoke.set_up(3, 0, src.loc)
 				smoke.attach(src)
 				smoke.start()

code/modules/power/smes.dm

@@ -303,7 +303,7 @@
 			for(var/mob/M in viewers(src))
 				M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2)
 			sleep(10*pick(4,5,6,7,10,14))
-			var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+			var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 			smoke.set_up(3, 0, src.loc)
 			smoke.attach(src)
 			smoke.start()
@@ -321,7 +321,7 @@
 				emp_act(2)
 		if(prob(5)) //smoke only
 			world << "\red SMES smoke in [src.loc.loc]"
-			var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+			var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 			smoke.set_up(3, 0, src.loc)
 			smoke.attach(src)
 			smoke.start()

code/modules/reagents/Chemistry-Reagents.dm

@@ -31,7 +31,7 @@ datum
 				var/datum/reagent/self = src
 				src = null										  //of the reagent to the mob on TOUCHING it.
 
-				if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke))
+				if(!istype(self.holder.my_atom, /obj/effect/effect/smoke/chem))
 					// If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl
 
 					if(method == TOUCH)
@@ -3091,7 +3091,7 @@ datum
 							var/datum/organ/internal/heart/L = H.internal_organs["heart"]
 							if (istype(L))
 								L.take_damage(100, 0)
-
+				holder.remove_reagent(src.id, FOOD_METABOLISM)
 
 		ethanol/deadrum
 			name = "Deadrum"

code/modules/reagents/Chemistry-Recipes.dm

@@ -433,7 +433,7 @@ datum
 			secondary = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/location = get_turf(holder.my_atom)
-				var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+				var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
 				S.attach(location)
 				S.set_up(holder, 10, 0, location)
 				playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)

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

@@ -118,7 +118,7 @@
 	if(istype(W,/obj/item/weapon/storage))
 		..() // -> item/attackby()
 	if((slices_num <= 0 || !slices_num) || !slice_path)
-		return 1
+		return 0
 	var/inaccurate = 0
 	if( \
 			istype(W, /obj/item/weapon/kitchenknife) || \

code/modules/research/circuitprinter.dm

@@ -101,7 +101,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 			user << "\The [name] must be linked to an R&D console first!"
 			return 1
 		if (O.is_open_container())
-			return 1
+			return 0
 		if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
 			user << "\red You cannot insert this item into the [name]!"
 			return 1

code/modules/research/destructive_analyzer.dm

@@ -99,6 +99,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 		spawn(10)
 			icon_state = "d_analyzer_l"
 			busy = 0
+		return 1
 	return
 
 //For testing purposes only.

code/unused/new_year.dm

@@ -95,7 +95,7 @@
 	playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
 	var/turf/T = get_turf(src)
 	if(T)
-		var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+		var/datum/effect/effect/system/smoke_spread/smoke = new
 		smoke.set_up(3, 0, src.loc)
 		smoke.attach(src)
 		smoke.start()

code/unused/spells.dm

@@ -318,7 +318,7 @@
 		if(T.y>world.maxy-4 || T.y<4)	continue
 		turfs += T
 	if(!turfs.len) turfs += pick(/turf in orange(6))
-	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+	var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 	smoke.set_up(10, 0, usr.loc)
 	smoke.start()
 	var/turf/picked = pick(turfs)
@@ -360,7 +360,7 @@
 
 	usr.say("SCYAR NILA [uppertext(A)]")
 
-	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+	var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 	smoke.set_up(5, 0, usr.loc)
 	smoke.attach(usr)
 	smoke.start()

config/example/config.txt

@@ -113,7 +113,7 @@ VOTE_PERIOD 600
 VOTE_AUTOTRANSFER_INITIAL 108000
 
 ##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 60 minutes)
-Vote_AUTOTRANSFER_INTERVAL 36000
+VOTE_AUTOTRANSFER_INTERVAL 36000
 
 ## prevents dead players from voting or starting votes
 #NO_DEAD_VOTE