The AI/bots now leave hidden fingerprints on things they touch.

The game will not load the empty goon and beta tester files on startup.
Moved modes that are broken/unfinished into the unused section.
Powersinks will eat more power
Firedoors should be fixed now.
Engineering solars moved away from engineering.(there is currently an empty room where one was. I dont have any good ideas for things to put in there atm so if you want to add something go ahead)


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

code/ATMOSPHERICS/pipes.dm

@@ -4,7 +4,7 @@ obj/machinery/atmospherics/pipe
 	var/datum/pipeline/parent
 
 	var/volume = 0
-
+	var/force = 20
 
 	layer = 2.4 //under wires with their 2.5
 

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

@@ -437,22 +437,6 @@ proc/process_ghost_teleport_locs()
 	name = "Aft Maintenance"
 	icon_state = "amaint"
 
-/area/maintenance/auxsolarport
-	name = "Port Auxiliary Solar Maintenance"
-	icon_state = "SolarcontrolA"
-
-/area/maintenance/starboardsolar
-	name = "Starboard Solar Maintenance"
-	icon_state = "SolarcontrolS"
-
-/area/maintenance/portsolar
-	name = "Port Solar Maintenance"
-	icon_state = "SolarcontrolP"
-
-/area/maintenance/auxsolarstarboard
-	name = "Starboard Auxiliary Solar Maintenance"
-	icon_state = "SolarcontrolA"
-
 /area/maintenance/storage
 	name = "Atmospherics"
 	icon_state = "green"
@@ -598,46 +582,68 @@ proc/process_ghost_teleport_locs()
 
 //Engineering
 
-/area/engine/engine_smes
-	name = "Engine SMES Room"
-	icon_state = "engine"
+/area/engine
+	engine_smes
+		name = "Engineering SMES"
+		icon_state = "engine_smes"
+		requires_power = 0//This area only covers the batteries and they deal with their own power
 
-/area/engine/engine_walls
-	name = "Engine Walls"
-	icon_state = "engine"
+	engineering
+		name = "Engineering"
+		icon_state = "engine"
 
-/area/engine/engine_gas_storage
-	name = "Engine Storage"
-	icon_state = "engine_gas_storage"
+	chiefs_office
+		name = "Cheif Engineers office"
+		icon_state = "engine_control"
 
-/area/engine/engine_hallway
-	name = "Engine Hallway"
-	icon_state = "engine_hallway"
 
-/area/engine/engineering
-	name = "Engineering"
-	icon_state = "engine_hallway"
+//Solars
 
-/area/engine/engine_mon
-	name = "Engine Monitoring"
-	icon_state = "engine_monitoring"
+/area/solar
+	requires_power = 0
+	luminosity = 1
+	sd_lighting = 0
 
-/area/engine/engine_CE_office
-	name = "Engine New Office"
-	icon_state = "engine_CE"
+	auxport
+		name = "Port Auxiliary Solar Array"
+		icon_state = "panelsA"
 
-/area/engine/combustion
-	name = "Engine Combustion Chamber"
-	icon_state = "engine"
-	music = "signal"
+	auxstarboard
+		name = "Starboard Auxiliary Solar Array"
+		icon_state = "panelsA"
 
-/area/engine/engine_control
-	name = "Engine Control"
-	icon_state = "engine_control"
+	fore
+		name = "Fore Solar Array"
+		icon_state = "yellow"
+
+	aft
+		name = "Aft Solar Array"
+		icon_state = "aft"
+
+	starboard
+		name = "Starboard Solar Array"
+		icon_state = "panelsS"
+
+	port
+		name = "Port Solar Array"
+		icon_state = "panelsP"
+
+/area/maintenance/auxsolarport
+	name = "Port Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
+
+/area/maintenance/starboardsolar
+	name = "Starboard Solar Maintenance"
+	icon_state = "SolarcontrolS"
+
+/area/maintenance/portsolar
+	name = "Port Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/auxsolarstarboard
+	name = "Starboard Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
 
-/area/engine/launcher
-	name = "Engine Launcher Room"
-	icon_state = "engine_monitoring"
 
 /area/assembly/chargebay
 	name = "Recharging Bay"
@@ -744,37 +750,6 @@ proc/process_ghost_teleport_locs()
 	name = "Vacant Office"
 	icon_state = "security"
 
-//Solars
-
-/area/solar
-	requires_power = 0
-	luminosity = 1
-	sd_lighting = 0
-
-/area/solar/auxport
-	name = "Port Auxiliary Solar Array"
-	icon_state = "panelsA"
-
-/area/solar/auxstarboard
-	name = "Starboard Auxiliary Solar Array"
-	icon_state = "panelsA"
-
-/area/solar/fore
-	name = "Fore Solar Array"
-	icon_state = "yellow"
-
-/area/solar/aft
-	name = "Aft Solar Array"
-	icon_state = "aft"
-
-/area/solar/starboard
-	name = "Starboard Solar Array"
-	icon_state = "panelsS"
-
-/area/solar/port
-	name = "Port Solar Array"
-	icon_state = "panelsP"
-
 /area/quartermaster
 	name = "Quartermasters"
 	icon_state = "quart"

code/game/algorithm.dm

@@ -10,8 +10,8 @@
 
 	jobban_loadbanfile()
 	jobban_updatelegacybans()
-	goon_loadfile()
-	beta_tester_loadfile()
+//	goon_loadfile() Somehow I doubt we need this anymore
+//	beta_tester_loadfile()
 	LoadBans()
 	process_teleport_locs() //Sets up the wizard teleport locations
 	process_ghost_teleport_locs() //Sets up ghost teleport locations.

code/game/atom_procs.dm

@@ -46,35 +46,44 @@
 					O << text("\red <B>[] has been hit by [] with []</B>", src, user, W)
 	return
 
-/atom/proc/add_fingerprint(mob/living/carbon/human/M as mob)
-	if ((!( istype(M, /mob/living/carbon/human) ) || !( istype(M.dna, /datum/dna) )))
-		return 0
+
+/atom/proc/add_fingerprint(mob/living/M as mob)
+	if(isnull(M)) return
+	if(isnull(M.key)) return
 	if (!( src.flags ) & 256)
 		return
-	if (M.gloves)
-		if(src.fingerprintslast != M.key)
-			src.fingerprintshidden += text("(Wearing gloves). Real name: [], Key: []",M.real_name, M.key)
-			src.fingerprintslast = M.key
-		return 0
-	if (!( src.fingerprints ))
-		src.fingerprints = text("[]", md5(M.dna.uni_identity))
-		if(src.fingerprintslast != M.key)
-			src.fingerprintshidden += text("Real name: [], Key: []",M.real_name, M.key)
-			src.fingerprintslast = M.key
-		return 1
+	if (ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if (!istype(H.dna, /datum/dna))
+			return 0
+		if (H.gloves)
+			if(src.fingerprintslast != H.key)
+				src.fingerprintshidden += text("(Wearing gloves). Real name: [], Key: []",H.real_name, H.key)
+				src.fingerprintslast = H.key
+			return 0
+		if (!( src.fingerprints ))
+			src.fingerprints = text("[]", md5(H.dna.uni_identity))
+			if(src.fingerprintslast != H.key)
+				src.fingerprintshidden += text("Real name: [], Key: []",H.real_name, H.key)
+				src.fingerprintslast = H.key
+			return 1
+		else
+			var/list/L = params2list(src.fingerprints)
+			L -= md5(H.dna.uni_identity)
+			while(L.len >= 3)
+				L -= L[1]
+			L += md5(H.dna.uni_identity)
+			src.fingerprints = list2params(L)
+			if(src.fingerprintslast != H.key)
+				src.fingerprintshidden += text("Real name: [], Key: []",H.real_name, H.key)
+				src.fingerprintslast = H.key
 	else
-		var/list/L = params2list(src.fingerprints)
-		L -= md5(M.dna.uni_identity)
-		while(L.len >= 3)
-			L -= L[1]
-		L += md5(M.dna.uni_identity)
-		src.fingerprints = list2params(L)
-
 		if(src.fingerprintslast != M.key)
 			src.fingerprintshidden += text("Real name: [], Key: []",M.real_name, M.key)
 			src.fingerprintslast = M.key
 	return
 
+
 /atom/proc/add_blood(mob/living/carbon/human/M as mob)
 	if (!( istype(M, /mob/living/carbon/human) ))
 		return 0

code/game/machinery/doors/firedoor.dm

@@ -51,7 +51,6 @@
 					src.sd_SetOpacity(1)
 					src.operating = 0
 					return
-	..()
 	return
 
 /obj/machinery/door/firedoor/process()

code/game/objects/devices/powersink.dm

@@ -12,7 +12,7 @@
 	throw_range = 2
 	m_amt = 750
 	w_amt = 750
-	var/drain_rate = 200000		// amount of power to drain per tick
+	var/drain_rate = 600000		// amount of power to drain per tick
 	var/power_drained = 0 		// has drained this much power
 	var/max_power = 1e8		// maximum power that can be drained before exploding
 	var/mode = 0		// 0 = off, 1=clamped (off), 2=operating

code/game/verbs/authorize.dm

@@ -42,6 +42,7 @@
 			src << "\blue[no_auth_motd]"
 		src.authenticating = 0
 
+/* The old goon auth/beta code is here
 /client/proc/beta_tester_auth()
 	set name = "Tester?"
 	/*if(istester(src))
@@ -161,4 +162,5 @@ var/list/beta_tester_keylist
 		goon_keylist.Remove(ckey)
 		goon_savefile()
 		return 1
-	return 0
+	return 0
+*/

code/modules/admin/admin.dm

@@ -238,7 +238,7 @@ var/showadminmessages = 1
 					//del(M)
 				if("Cancel")
 					return
-
+/*
 	if (href_list["remove"])
 		if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host"  )))
 			var/t = href_list["remove"]
@@ -246,7 +246,7 @@ var/showadminmessages = 1
 				log_admin("[key_name(usr)] removed [t] from the goonlist.")
 				message_admins("\blue [key_name_admin(usr)] removed [t] from the goonlist.")
 				remove_goon(t)
-
+*/
 	if (href_list["mute2"])
 		if ((src.rank in list( "Moderator", "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host"  )))
 			var/mob/M = locate(href_list["mute2"])
@@ -266,24 +266,28 @@ var/showadminmessages = 1
 			var/dat = text({"<B>What mode do you wish to play?</B><HR>
 			<A href='?src=\ref[src];c_mode2=secret'>Secret</A><br>
 			<A href='?src=\ref[src];c_mode2=wizard'>Wizard</A><br>
-			<A href='?src=\ref[src];c_mode2=restructuring'>Corporate Restructuring</A><br>
-			<A href='?src=\ref[src];c_mode2=random'>Random</A><br>
 			<A href='?src=\ref[src];c_mode2=traitor'>Traitor</A><br>
 			<A href='?src=\ref[src];c_mode2=meteor'>Meteor</A><br>
 			<A href='?src=\ref[src];c_mode2=extended'>Extended</A><br>
-			<A href='?src=\ref[src];c_mode2=monkey'>Monkey</A><br>
 			<A href='?src=\ref[src];c_mode2=nuclear'>Nuclear Emergency</A><br>
 			<A href='?src=\ref[src];c_mode2=blob'>Blob</A><br>
 			<A href='?src=\ref[src];c_mode2=sandbox'>Sandbox</A><br>
 			<A href='?src=\ref[src];c_mode2=revolution'>Revolution</A><br>
 			<A href='?src=\ref[src];c_mode2=cult'>Cult</A><br>
 			<A href='?src=\ref[src];c_mode2=malfunction'>AI Malfunction</A><br>
-			<A href='?src=\ref[src];c_mode2=deathmatch'>Death Commando Deathmatch</A><br>
-			<A href='?src=\ref[src];c_mode2=confliction'>Confliction (TESTING)</A><br>
-			<A href='?src=\ref[src];c_mode2=ctf'>Capture The Flag (Beta)</A><br><br>
 			<A href='?src=\ref[src];c_mode2=changeling'>Changeling</A><br><br>
 			Now: [master_mode]\n"})
 			usr << browse(dat, "window=c_mode")
+/*
+			<A href='?src=\ref[src];c_mode2=restructuring'>Corporate Restructuring</A><br>
+			<A href='?src=\ref[src];c_mode2=random'>Random</A><br>
+			<A href='?src=\ref[src];c_mode2=monkey'>Monkey</A><br>
+			<A href='?src=\ref[src];c_mode2=deathmatch'>Death Commando Deathmatch</A><br>
+			<A href='?src=\ref[src];c_mode2=confliction'>Confliction (TESTING)</A><br>
+			<A href='?src=\ref[src];c_mode2=ctf'>Capture The Flag (Beta)</A><br><br>
+
+*/
+
 
 	if (href_list["c_mode2"])
 		if ((src.rank in list( "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host"  )))
@@ -1575,7 +1579,7 @@ var/showadminmessages = 1
 //			if(lvl == 6 )
 	usr << browse(dat, "window=admin2;size=210x180")
 	return
-
+/*
 /obj/admins/proc/goons()
 	var/dat = "<HR><B>GOOOOOOONS</B><HR><table cellspacing=5><tr><th>Key</th><th>SA Username</th></tr>"
 	for(var/t in goon_keylist)
@@ -1589,7 +1593,7 @@ var/showadminmessages = 1
 		dat += text("<tr><td>[t]</td></tr>")
 	dat += "</table>"
 	usr << browse(dat, "window=ban;size=300x400")
-
+*/
 /obj/admins/proc/Secrets()
 
 	var/lvl = 0

code/modules/admin/admin_verbs.dm

@@ -1215,7 +1215,7 @@
 	if (src.holder)
 		src.holder.Secrets()
 	return
-
+/*
 /client/proc/goons()
 	set name = "Goons"
 	set category = "Admin"
@@ -1229,7 +1229,7 @@
 	if (src.holder)
 		src.holder.beta_testers()
 	return
-
+*/
 /client/proc/voting()
 	set name = "Voting"
 	set category = "Admin"

code/modules/power/singularity/singularity.dm

@@ -79,7 +79,7 @@ var/global/list/uneatable = list(
 		eat()
 		dissipate()
 		check_energy()
-		if(current_size >= 5)
+		if(current_size >= 3)
 			move()
 			if(current_size <= 7)
 				pulse()

tgstation.dme

@@ -31,18 +31,13 @@
 #define FILE_DIR "code/game/gamemodes"
 #define FILE_DIR "code/game/gamemodes/blob"
 #define FILE_DIR "code/game/gamemodes/changeling"
-#define FILE_DIR "code/game/gamemodes/ctf"
 #define FILE_DIR "code/game/gamemodes/cult"
-#define FILE_DIR "code/game/gamemodes/deathmatch"
 #define FILE_DIR "code/game/gamemodes/events"
 #define FILE_DIR "code/game/gamemodes/extended"
 #define FILE_DIR "code/game/gamemodes/malfunction"
 #define FILE_DIR "code/game/gamemodes/meteor"
-#define FILE_DIR "code/game/gamemodes/monkey"
 #define FILE_DIR "code/game/gamemodes/nuclear"
-#define FILE_DIR "code/game/gamemodes/restructuring"
 #define FILE_DIR "code/game/gamemodes/revolution"
-#define FILE_DIR "code/game/gamemodes/ruby"
 #define FILE_DIR "code/game/gamemodes/sandbox"
 #define FILE_DIR "code/game/gamemodes/traitor"
 #define FILE_DIR "code/game/gamemodes/wizard"
@@ -104,6 +99,7 @@
 #define FILE_DIR "code/modules/power/singularity"
 #define FILE_DIR "code/modules/power/singularity/particle_accelerator"
 #define FILE_DIR "code/unused"
+#define FILE_DIR "code/unused/gamemodes"
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/computer2"
 #define FILE_DIR "code/WorkInProgress/experimental"
@@ -317,10 +313,7 @@
 #include "code\game\gamemodes\blob\theblob.dm"
 #include "code\game\gamemodes\changeling\changeling.dm"
 #include "code\game\gamemodes\changeling\changeling_powers.dm"
-#include "code\game\gamemodes\ctf\ctf.dm"
-#include "code\game\gamemodes\ctf\ctf_items.dm"
 #include "code\game\gamemodes\cult\cult.dm"
-#include "code\game\gamemodes\deathmatch\deathmatch.dm"
 #include "code\game\gamemodes\events\clang.dm"
 #include "code\game\gamemodes\events\dust.dm"
 #include "code\game\gamemodes\extended\extended.dm"
@@ -328,11 +321,9 @@
 #include "code\game\gamemodes\malfunction\malfunction.dm"
 #include "code\game\gamemodes\meteor\meteor.dm"
 #include "code\game\gamemodes\meteor\meteors.dm"
-#include "code\game\gamemodes\monkey\monkey.dm"
 #include "code\game\gamemodes\nuclear\nuclear.dm"
 #include "code\game\gamemodes\nuclear\nuclearbomb.dm"
 #include "code\game\gamemodes\nuclear\pinpointer.dm"
-#include "code\game\gamemodes\restructuring\restructuring.dm"
 #include "code\game\gamemodes\revolution\revolution.dm"
 #include "code\game\gamemodes\sandbox\h_sandbox.dm"
 #include "code\game\gamemodes\sandbox\sandbox.dm"