diff --git a/code/WorkInProgress/recycling/conveyor.dm b/code/WorkInProgress/recycling/conveyor.dm
index 8e0f9f984c..ce1acbaf55 100644
--- a/code/WorkInProgress/recycling/conveyor.dm
+++ b/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))
-					var/mob/M = A
-					if(M.buckled == src)
-						var/obj/machinery/conveyor/C = locate() in get_step(src, dir)
-						M.buckled = null
-						step(M,dir)
-						if(C)
-							M.buckled = C
+				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
+					if(ismob(A))
+						var/mob/M = A
+						if(M.buckled == src)
+							var/obj/machinery/conveyor/C = locate() in get_step(src, dir)
+							M.buckled = null
+							step(M,dir)
+							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)
-				else
-					step(A,movedir)
+						step(A,movedir)
 
 // attack with item, place item on conveyor
 
diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm
index 30c2fbe677..16a1006278 100644
--- a/code/game/objects/items/weapons/guns_new.dm
+++ b/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"
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 524eec25d4..238cc255b7 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/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
-		update_icon()
+		if(Proj.flag != "bullet")
+			power += Proj.damage
+			update_icon()
 		return
 
 
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
index 26a555e6dd..1340314342 100644
Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 16e4ad82f9..b6dc33b23c 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ