- Undid my edits to the master controller regarding fast atmos.. I've…

… tested it on the live server in several rounds and think we could spare to call atmos processing twice as often, meaning air movement would spread twice as fast. Calling it 4x as often was too much tho, resulting in noticeable lag, especially when the station was destroyed.

- Time to tidy up my old projects: Moved a few of my old, unfinished projects to unused: liquid simulation, brewing, heavy cables and logic gates/cables.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5621 316c924e-a436-60f5-8080-3fe189b3f50e

code/controllers/configuration.dm

@@ -59,10 +59,6 @@
 	var/wikiurl
 	var/forumurl
 
-	var/fast_atmos_1 = 0
-	var/fast_atmos_2 = 0
-	var/fast_atmos_3 = 0
-
 	//Alert level description
 	var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
 	var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted."

code/controllers/master_controller.dm

@@ -122,11 +122,10 @@ datum/controller/game_controller/proc/process()
 
 				sleep(breather_ticks)
 
-				//SUN AND LIQUID
+				//SUN
 				timer = world.timeofday
 				last_thing_processed = sun.type
 				sun.calc_position()
-				process_liquid()
 				sun_cost = (world.timeofday - timer) / 10
 
 				sleep(breather_ticks)
@@ -142,15 +141,6 @@ datum/controller/game_controller/proc/process()
 				timer = world.timeofday
 				process_diseases()
 				diseases_cost = (world.timeofday - timer) / 10
-
-				//AIR (Faster atmos 1!)
-				if(config.fast_atmos_1)
-					if(!air_processing_killed)
-						timer = world.timeofday
-						last_thing_processed = air_master.type
-						air_master.process()
-						air_cost += (world.timeofday - timer) / 10
-
 				sleep(breather_ticks)
 
 				//MACHINES
@@ -164,15 +154,6 @@ datum/controller/game_controller/proc/process()
 				timer = world.timeofday
 				process_objects()
 				objects_cost = (world.timeofday - timer) / 10
-
-				//AIR (Faster atmos 2!)
-				if(config.fast_atmos_2)
-					if(!air_processing_killed)
-						timer = world.timeofday
-						last_thing_processed = air_master.type
-						air_master.process()
-						air_cost += (world.timeofday - timer) / 10
-
 				sleep(breather_ticks)
 
 				//PIPENETS
@@ -190,14 +171,6 @@ datum/controller/game_controller/proc/process()
 
 				sleep(breather_ticks)
 
-				//AIR (Faster atmos 3!)
-				if(config.fast_atmos_3)
-					if(!air_processing_killed)
-						timer = world.timeofday
-						last_thing_processed = air_master.type
-						air_master.process()
-						air_cost += (world.timeofday - timer) / 10
-
 				//EVENTS
 				timer = world.timeofday
 				process_events()
@@ -219,6 +192,7 @@ datum/controller/game_controller/proc/process()
 			else
 				sleep(10)
 
+/*
 datum/controller/game_controller/proc/process_liquid()
 	last_thing_processed = /datum/puddle
 	var/i = 1
@@ -229,6 +203,7 @@ datum/controller/game_controller/proc/process_liquid()
 			i++
 			continue
 		puddles.Cut(i,i+1)
+*/
 
 datum/controller/game_controller/proc/process_mobs()
 	var/i = 1

code/game/machinery/vending.dm

@@ -723,7 +723,7 @@
 	products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/orange = 4,/obj/item/clothing/head/hardhat = 4,
 					/obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/screwdriver = 12,
 					/obj/item/weapon/crowbar = 12,/obj/item/weapon/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/wrench = 12,/obj/item/device/t_scanner = 12,
-					/obj/item/weapon/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
+					/obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
 					/obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5,
 					/obj/item/weapon/stock_parts/matter_bin = 5,/obj/item/weapon/stock_parts/manipulator = 5,/obj/item/weapon/stock_parts/console_screen = 5)
 	// There was an incorrect entry (cablecoil/power).  I improvised to cablecoil/heavyduty.

code/modules/admin/admin_verbs.dm

@@ -255,7 +255,6 @@ var/list/admin_verbs_hideable = list(
 		/client/proc/ticklag,
 		/client/proc/cmd_admin_grantfullaccess,
 		/client/proc/kaboom,
-		/client/proc/splash,
 		/client/proc/cmd_admin_areatest
 		)
 

code/modules/admin/verbs/mapping.dm

@@ -146,7 +146,6 @@ var/intercom_range_display_status = 0
 	src.verbs += /client/proc/ticklag	//allows you to set the ticklag.
 	src.verbs += /client/proc/cmd_admin_grantfullaccess
 	src.verbs += /client/proc/kaboom
-	src.verbs += /client/proc/splash
 	src.verbs += /client/proc/cmd_admin_areatest
 	src.verbs += /client/proc/cmd_admin_rejuvenate
 	src.verbs += /datum/admins/proc/show_traitor_panel

tgstation.dme

@@ -6,6 +6,39 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "maps"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/weapons"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES
@@ -717,7 +750,6 @@
 #include "code\modules\clothing\under\jobs\engineering.dm"
 #include "code\modules\clothing\under\jobs\medsci.dm"
 #include "code\modules\clothing\under\jobs\security.dm"
-#include "code\modules\destilery\main.dm"
 #include "code\modules\detectivework\detective_work.dm"
 #include "code\modules\detectivework\evidence.dm"
 #include "code\modules\detectivework\footprints_and_rag.dm"
@@ -746,7 +778,6 @@
 #include "code\modules\library\lib_items.dm"
 #include "code\modules\library\lib_machines.dm"
 #include "code\modules\library\lib_readme.dm"
-#include "code\modules\liquid\splash_simulation.dm"
 #include "code\modules\mining\machine_input_output_plates.dm"
 #include "code\modules\mining\machine_processing.dm"
 #include "code\modules\mining\machine_stacking.dm"
@@ -957,8 +988,6 @@
 #include "code\modules\paperwork\stamps.dm"
 #include "code\modules\power\apc.dm"
 #include "code\modules\power\cable.dm"
-#include "code\modules\power\cable_heavyduty.dm"
-#include "code\modules\power\cable_logic.dm"
 #include "code\modules\power\cell.dm"
 #include "code\modules\power\engine.dm"
 #include "code\modules\power\generator.dm"