Went though the oddly few runtimes

Fixed up a few more firedoors on the map
Optables will respect air groups now
The Singularity:
Might produce less lag when eating things now.
80% down from 100% chance for a beacon to force movement.


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

code/datums/datumvars.dm

@@ -8,7 +8,8 @@ client
 		var/title = ""
 		var/body = ""
 
-		if (istype(D, /atom))
+		if(!D)	return
+		if(istype(D, /atom))
 			var/atom/A = D
 			title = "[A.name] (\ref[A]) = [A.type]"
 

code/defines/obj/machinery.dm

@@ -201,22 +201,6 @@
 	flags = FPRINT
 	use_power = 0
 
-/obj/machinery/optable
-	name = "Operating Table"
-	desc = "Used for advanced medical procedures. Apparently this includes the clown."
-	icon = 'surgery.dmi'
-	icon_state = "table2-idle"
-	density = 1
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 1
-	active_power_usage = 5
-	var/mob/living/carbon/human/victim = null
-	var/strapped = 0.0
-
-	var/obj/machinery/computer/operating/computer = null
-	var/id = 0.0
-
 /obj/machinery/restruct
 	name = "DNA Physical Restructurization Accelerator"
 	desc = "This looks complex."

code/game/gamemodes/meteor/meteor.dm

@@ -12,6 +12,7 @@
 	world << "<B>The space station has been stuck in a major meteor shower. You must escape from the station or at least live.</B>"
 
 /datum/game_mode/meteor/post_setup()
+	defer_powernet_rebuild = 2//Might help with the lag
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	spawn(meteordelay)

code/game/jobs/jobprocs.dm

@@ -628,16 +628,15 @@
 					NL += T
 		src.loc = pick(NL)
 		*/
-	if(src.mind.assigned_role == "Cyborg")
-		src << "YOU ARE GETTING BORGED NOW"
-		src.Robotize()
-	else
-		src.equip_if_possible(new /obj/item/device/radio/headset(src), slot_ears)
-		var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(src)
-		new /obj/item/weapon/storage/box(BPK)
-		src.equip_if_possible(BPK, slot_back,1)
-
-
+	if(src.mind)
+		if(src.mind.assigned_role == "Cyborg")
+			src << "YOU ARE GETTING BORGED NOW"
+			src.Robotize()
+			return
+	src.equip_if_possible(new /obj/item/device/radio/headset(src), slot_ears)
+	var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(src)
+	new /obj/item/weapon/storage/box(BPK)
+	src.equip_if_possible(BPK, slot_back,1)
 	/*
 	spawn(10)
 		var/obj/item/weapon/camera_test/CT = new/obj/item/weapon/camera_test(src.loc)

code/game/machinery/OpTable.dm

@@ -1,3 +1,19 @@
+/obj/machinery/optable
+	name = "Operating Table"
+	desc = "Used for advanced medical procedures. Apparently this includes the clown."
+	icon = 'surgery.dmi'
+	icon_state = "table2-idle"
+	density = 1
+	anchored = 1.0
+	use_power = 1
+	idle_power_usage = 1
+	active_power_usage = 5
+	var/mob/living/carbon/human/victim = null
+	var/strapped = 0.0
+
+	var/obj/machinery/computer/operating/computer = null
+	var/id = 0.0
+
 /obj/machinery/optable/New()
 	..()
 	for(var/obj/machinery/computer/operating/O in world)
@@ -60,10 +76,14 @@
 		del(src)
 	return
 
+/obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0)) return 1
 
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return 1
+	else
+		return 0
 
-/obj/machinery/optable/CanPass(atom/movable/O as mob|obj, target as turf)
-	return (istype(O) && O.checkpass(PASSTABLE))
 
 /obj/machinery/optable/MouseDrop_T(obj/O as obj, mob/user as mob)
 

code/game/objects/explosion.dm

@@ -3,7 +3,8 @@ var/roundExplosions = 1
 proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
 	if(!epicenter) return
 	spawn(0)
-		defer_powernet_rebuild = 1
+		if(defer_powernet_rebuild != 2)
+			defer_powernet_rebuild = 1
 		if (!istype(epicenter, /turf))
 			epicenter = get_turf(epicenter.loc)
 		playsound(epicenter.loc, 'explosionfar.ogg', 100, 1, round(devastation_range*2,1) )
@@ -73,7 +74,8 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 
 		sleep(-1)
 		sleep(20)
-		defer_powernet_rebuild = 0
+		if(defer_powernet_rebuild != 2)
+			defer_powernet_rebuild = 0
 	return 1
 
 

code/modules/admin/verbs/BrokenInhands.dm

@@ -0,0 +1,36 @@
+/proc/getbrokeninhands()
+	var/icon/IL = new('items_lefthand.dmi')
+	var/list/Lstates = IL.IconStates()
+	var/icon/IR = new('items_righthand.dmi')
+	var/list/Rstates = IR.IconStates()
+
+
+	var/text
+	for(var/A in typesof(/obj/item))
+		var/obj/item/O = new A( locate(1,1,1) )
+		if(!O) continue
+		var/icon/J = new(O.icon)
+		var/list/istates = J.IconStates()
+		if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.item_state))
+			if(O.icon_state)
+				text += "[O.type] WANTS IN LEFT HAND CALLED\n\"[O.icon_state]\".\n"
+		if(!Rstates.Find(O.icon_state) && !Rstates.Find(O.item_state))
+			if(O.icon_state)
+				text += "[O.type] WANTS IN RIGHT HAND CALLED\n\"[O.icon_state]\".\n"
+
+
+		if(O.icon_state)
+			if(!istates.Find(O.icon_state))
+				text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.icon_state]\" IN \"[O.icon]\"\n"
+		if(O.item_state)
+			if(!istates.Find(O.item_state))
+				text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
+		text+="\n"
+		del(O)
+	if(text)
+		var/F = file("broken_icons.txt")
+		fdel(F)
+		F << text
+		world << "Completely successfully and written to [F]"
+
+

code/modules/mob/new_player/new_player.dm

@@ -293,8 +293,9 @@ mob/new_player
 					ailist += A
 			if (ailist.len)
 				var/mob/living/silicon/ai/announcer = pick(ailist)
-				if(character.mind.assigned_role != "Cyborg"&&character.mind.special_role != "MODE")
-					announcer.say("[character.real_name] has been sent from Centcom to fill the job of [rank] on [station_name].")
+				if(character.mind)
+					if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
+						announcer.say("[character.real_name] has been sent from Centcom to fill the job of [rank] on [station_name].")
 					//announcer.say("[character.real_name], the [rank], has awoken from cryo sleep.") -Old Message
 
 

code/modules/power/cable.dm

@@ -156,7 +156,10 @@
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red [user] cuts the cable.", 1)
 
-		defer_powernet_rebuild = 0		// to fix no-action bug
+		if(defer_powernet_rebuild)
+			if(netnum && powernets && powernets.len >= netnum)
+				var/datum/powernet/PN = powernets[netnum]
+				PN.cut_cable(src)
 		del(src)
 
 		return	// not needed, but for clarity

code/modules/power/singularity/singularity.dm

@@ -97,9 +97,11 @@ var/global/list/uneatable = list(
 						event()
 		return
 
+
 	attack_ai() //to prevent ais from gibbing themselves when they click on one.
 		return
 
+
 	proc
 		dissipate()
 			if(!dissipate)
@@ -201,6 +203,8 @@ var/global/list/uneatable = list(
 
 		eat()
 			set background = 1
+			if(defer_powernet_rebuild != 2)
+				defer_powernet_rebuild = 1
 			for(var/atom/movable/X in orange(consume_range,src))
 				consume(X)
 			for(var/turf/X in orange(consume_range,src))
@@ -217,6 +221,8 @@ var/global/list/uneatable = list(
 						if(M.magpulse)
 							continue
 					step_towards(H,src)
+			if(defer_powernet_rebuild != 2)
+				defer_powernet_rebuild = 0
 			return
 
 
@@ -229,6 +235,7 @@ var/global/list/uneatable = list(
 				explosion(src.loc,10,15,20,40)
 				if(src) del(src)
 				return
+
 			var/gain = 0
 			if(is_type_in_list(A, uneatable))
 				return 0
@@ -262,9 +269,9 @@ var/global/list/uneatable = list(
 		move(var/movement_dir = 0)
 			if(!move_self)
 				return 0
-			if(!target && !(movement_dir in cardinal))
+			if(!(movement_dir in cardinal))
 				movement_dir = pick(NORTH, SOUTH, EAST, WEST)
-			else if(target)
+			if(target && prob(80))
 				movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
 			if(current_size >= 9)//The superlarge one does not care about things in its way
 				spawn(0)

tgstation.dme

@@ -653,6 +653,7 @@
 #include "code\modules\admin\verbs\adminjump.dm"
 #include "code\modules\admin\verbs\adminsay.dm"
 #include "code\modules\admin\verbs\atmosdebug.dm"
+#include "code\modules\admin\verbs\BrokenInhands.dm"
 #include "code\modules\admin\verbs\deadsay.dm"
 #include "code\modules\admin\verbs\debug.dm"
 #include "code\modules\admin\verbs\diagnostics.dm"