Fixed a rechargestation runtime.

Added a few misc areas.
Changed a number in the prefs that might help with less assistants.


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

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

@@ -1167,6 +1167,33 @@ proc/process_ghost_teleport_locs()
 	name = "AI Main New"
 	icon_state = "storage"
 
+
+
+//Misc
+
+
+
+/area/wreck/ai
+	name = "AI Chamber"
+	icon_state = "ai"
+
+/area/wreck/main
+	name = "Wreck"
+	icon_state = "storage"
+
+/area/wreck/engineering
+	name = "Power Room"
+	icon_state = "engine"
+
+/area/wreck/bridge
+	name = "Bridge"
+	icon_state = "bridge"
+
+/area/generic
+	name = "Unknown"
+	icon_state = "storage"
+
+
 /////////////////////////////////////////////////////////////////////
 /*
  Lists of areas to be used with is_type_in_list.

code/game/machinery/portable_turret.dm

@@ -924,3 +924,13 @@ Neutralize All Unidentified Life Signs: []<BR>"},
 					sleep(30)
 					Parent_Turret.attacked = 0
 		..()
+
+
+
+
+/obj/machinery/porta_turret/stationary
+	emagged = 1
+
+	New()
+		installation = new/obj/item/weapon/gun/energy/laser(src.loc)
+		..()

code/game/machinery/rechargestation.dm

@@ -75,8 +75,9 @@
 
 		restock_modules()
 			if(src.occupant)
-				if (istype(occupant, /mob/living/silicon/robot))
+				if(istype(occupant, /mob/living/silicon/robot))
 					var/mob/living/silicon/robot/R = occupant
+					if(R.module && R.module.modules)
 						var/list/um = R.contents|R.module.modules
 						// ^ makes sinle list of active (R.contents) and inactive modules (R.module.modules)
 						for(var/obj/O in um)

code/game/objects/structures.dm

@@ -1,21 +1,13 @@
 obj/structure
 	icon = 'structures.dmi'
 
-	girder
+/obj/structure/girder
 	icon_state = "girder"
 	anchored = 1
 	density = 1
 	var/state = 0
 
-		displaced
-			icon_state = "displaced"
-			anchored = 0
-
-		reinforced
-			icon_state = "reinforced"
-			state = 2
-
-/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob)
+	attackby(obj/item/W as obj, mob/user as mob)
 		if(istype(W, /obj/item/weapon/wrench) && state == 0 && anchored && !istype(src,/obj/structure/girder/displaced))
 			playsound(src.loc, 'Ratchet.ogg', 100, 1)
 			user << "\blue Now disassembling the girder"
@@ -111,11 +103,13 @@ obj/structure
 		else
 			..()
 
-/obj/structure/girder/blob_act()
+
+	blob_act()
 		if(prob(40))
 			del(src)
 
-/obj/structure/girder/ex_act(severity)
+
+	ex_act(severity)
 		switch(severity)
 			if(1.0)
 				del(src)
@@ -135,6 +129,14 @@ obj/structure
 			else
 		return
 
+
+/obj/structure/girder/displaced
+	icon_state = "displaced"
+	anchored = 0
+
+/obj/structure/girder/reinforced
+	icon_state = "reinforced"
+	state = 2
 // LATTICE
 
 

code/modules/mob/new_player/new_player.dm

@@ -37,11 +37,11 @@ mob/new_player
 
 		if(!preferences.savefile_load(src, 0))
 			preferences.ShowChoices(src)
-			if (!client.changes)
+			if(!client.changes)
 				changes()
 		else
 			var/lastchangelog = length('changelog.html')
-			if (!client.changes && preferences.lastchangelog!=lastchangelog)
+			if(!client.changes && preferences.lastchangelog!=lastchangelog)
 				changes()
 				preferences.lastchangelog = lastchangelog
 				preferences.savefile_save(src)
@@ -52,7 +52,7 @@ mob/new_player
 		Quick note: local dream daemon instances don't seem to cache images right. Might be
 		a local problem with my machine but it's annoying nontheless.
 		*/
-		if (client)
+		if(client)
 			//load the PDA iconset into the client
 			src << browse_rsc('pda_atmos.png')
 			src << browse_rsc('pda_back.png')

code/modules/mob/new_player/preferences.dm

@@ -69,7 +69,7 @@ datum/preferences
 	New()
 		randomize_name()
 		for(var/n in occupation)
-			n=1
+			n=0
 		..()
 
 	//The mob should have a gender you want before running this proc.
@@ -586,26 +586,6 @@ datum/preferences
 				if ("random")
 					randomize_hair_color("hair")
 
-/*
-		if (link_tags["r_hair"])
-			var/new_component = input(user, "Please select red hair component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				r_hair = max(min(round(text2num(new_component)), 255), 1)
-
-		if (link_tags["g_hair"])
-			var/new_component = input(user, "Please select green hair component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				g_hair = max(min(round(text2num(new_component)), 255), 1)
-
-		if (link_tags["b_hair"])
-			var/new_component = input(user, "Please select blue hair component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				b_hair = max(min(round(text2num(new_component)), 255), 1)
-*/
-
 		if (link_tags["facial"])
 			switch(link_tags["facial"])
 				if ("input")
@@ -617,25 +597,6 @@ datum/preferences
 				if ("random")
 					randomize_hair_color("facial")
 
-/*
-		if (link_tags["r_facial"])
-			var/new_component = input(user, "Please select red facial component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				r_facial = max(min(round(text2num(new_component)), 255), 1)
-
-		if (link_tags["g_facial"])
-			var/new_component = input(user, "Please select green facial component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				g_facial = max(min(round(text2num(new_component)), 255), 1)
-
-		if (link_tags["b_facial"])
-			var/new_component = input(user, "Please select blue facial component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				b_facial = max(min(round(text2num(new_component)), 255), 1)
-*/
 		if (link_tags["eyes"])
 			switch(link_tags["eyes"])
 				if ("input")
@@ -647,25 +608,6 @@ datum/preferences
 				if ("random")
 					randomize_eyes_color()
 
-/*
-		if (link_tags["r_eyes"])
-			var/new_component = input(user, "Please select red eyes component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				r_eyes = max(min(round(text2num(new_component)), 255), 1)
-
-		if (link_tags["g_eyes"])
-			var/new_component = input(user, "Please select green eyes component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				g_eyes = max(min(round(text2num(new_component)), 255), 1)
-
-		if (link_tags["b_eyes"])
-			var/new_component = input(user, "Please select blue eyes component: 1-255", "Character Generation")  as text
-
-			if (new_component)
-				b_eyes = max(min(round(text2num(new_component)), 255), 1)
-*/
 		if (link_tags["s_tone"])
 			switch(link_tags["s_tone"])
 				if ("random")