Fixed a bunch of bugs in this one. There were some problems with projectiles not powering the singularity field generators, which is clearly a very, very bad thing!!

I also fixed some/a problems with conveyer belts.

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

code/WorkInProgress/recycling/conveyor.dm

@@ -69,20 +69,21 @@
 	spawn(1)	// slight delay to prevent infinite propagation due to map order
 		for(var/atom/movable/A in affecting)
 			if(!A.anchored)
-				if(ismob(A))
+				if(isturf(A.loc)) // this is to prevent an ugly bug that forces a player to drop what they're holding if they recently pick it up from the conveyer belt
-					var/mob/M = A
+					if(ismob(A))
-					if(M.buckled == src)
+						var/mob/M = A
-						var/obj/machinery/conveyor/C = locate() in get_step(src, dir)
+						if(M.buckled == src)
-						M.buckled = null
+							var/obj/machinery/conveyor/C = locate() in get_step(src, dir)
-						step(M,dir)
+							M.buckled = null
-						if(C)
+							step(M,dir)
-							M.buckled = C
+							if(C)
+								M.buckled = C
+							else
+								new/obj/item/weapon/cable_coil/cut(M.loc)
 						else
-							new/obj/item/weapon/cable_coil/cut(M.loc)
+							step(M,movedir)
 					else
-						step(M,movedir)
+						step(A,movedir)
-				else
-					step(A,movedir)
 
 // attack with item, place item on conveyor
 

code/game/objects/items/weapons/guns_new.dm

@@ -86,9 +86,9 @@
 		name = "declown"
 		icon_state = "declone"
 		pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-		damage = 70
+		damage = 0
 		mobdamage = list(BRUTE = 0, BURN = 0, TOX = 0, OXY = 0, CLONE = 70)
-		flag = "laser"
+		flag = "bio"
 
 	dart
 		name = "dart"

code/modules/power/singularity/field_generator.dm

@@ -172,8 +172,9 @@ field_generator power level display
 
 
 	bullet_act(var/obj/item/projectile/Proj)
-		power -= Proj.damage
+		if(Proj.flag != "bullet")
-		update_icon()
+			power += Proj.damage
+			update_icon()
 		return