Fixed a supply shuttle runtime due to the stamping missing a null check.

Added a null check to cleanbots and new player preferences.
Did a bit of blob and antimatter work.


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

code/modules/critters/critters.dm

@@ -91,6 +91,12 @@
 	brutevuln = 2
 
 
+/*	process()
+		if(prob(50))
+			TakeDamage(1)
+		..()*/
+
+
 	Die()
 		src.visible_message("<b>[src]</b> ruptures and explodes!")
 		src.alive = 0

code/modules/mob/new_player/preferences.dm

@@ -232,8 +232,7 @@ datum/preferences
 		 // Modify this if you added more jobs and it looks like a mess. Add the jobs in the splitJobs that you want to trigger and intitate a new table.
 
 		if(splitJobs == null)
-			if (ticker.current_state >= GAME_STATE_PLAYING
-)
+			if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
 				splitJobs = list()
 			else
 				splitJobs = list("Chief Engineer")

code/modules/power/antimatter/control.dm

@@ -14,6 +14,7 @@
 	var/obj/item/weapon/am_containment/fueljar
 	var/update_shield_icons = 0
 	var/stability = 100
+	var/exploding = 0
 
 	var/active = 0//On or not
 	var/fuel_injection = 2//How much fuel to inject
@@ -27,6 +28,7 @@
 
 	var/stored_power = 0//Power to deploy per tick
 
+
 	New()
 		..()
 		linked_shielding = list()
@@ -40,6 +42,10 @@
 
 
 	process()
+		if(exploding)
+			explosion(get_turf(src),8,12,18,12)
+			if(src) del(src)
+
 		if(update_shield_icons && !shield_icon_delay)
 			check_shield_icons()
 			update_shield_icons = 0

code/modules/power/antimatter/shielding.dm

@@ -25,8 +25,9 @@ proc/cardinalrange(var/center)
 	var/stability = 100//If this gets low bad things tend to happen
 	var/efficiency = 1//How many cores this core counts for when doing power processing, plasma in the air and stability could affect this
 
-	New(var/l)
-		..(l)
+
+	New(loc)
+		..(loc)
 		spawn(10)
 			controllerscan()
 		return
@@ -182,8 +183,8 @@ proc/cardinalrange(var/center)
 
 	proc/check_stability(var/injecting_fuel = 0)
 		if(stability > 0) return
-		if(injecting_fuel)
-			explosion(get_turf(src),8,12,18,12)
+		if(injecting_fuel && control_unit)
+			control_unit.exploding = 1
 		if(src)
 			del(src)
 		return

code/modules/power/cable.dm

@@ -141,7 +141,7 @@
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red [user] cuts the cable.", 1)
 
-		if(!defer_powernet_rebuild)
+		if(defer_powernet_rebuild)
 			if(netnum && powernets && powernets.len >= netnum)
 				var/datum/powernet/PN = powernets[netnum]
 				PN.cut_cable(src)