Merge pull request #11688 from Markolie/swarmerfix

Fix gutlunches not eating and tesla wormhole fix

code/game/objects/effects/portals.dm

@@ -79,14 +79,20 @@
 		user.forceMove(get_turf(src))
 		return TRUE
 
-/obj/effect/portal/proc/teleport(atom/movable/M, force = FALSE)
+/obj/effect/portal/proc/can_teleport(atom/movable/M)
+	. = TRUE
+
 	if(!istype(M))
-		return FALSE
+		. = FALSE
 
 	if(!M.simulated || iseffect(M))
-		return FALSE
+		. = FALSE
 
 	if(M.anchored && ismecha(M))
+		. = FALSE
+
+/obj/effect/portal/proc/teleport(atom/movable/M)
+	if(!can_teleport(M))
 		return FALSE
 
 	if(!target)

code/modules/events/wormholes.dm

@@ -41,14 +41,14 @@
 	icon_state = "anom"
 	failchance = 0
 
+/obj/effect/portal/wormhole/can_teleport(atom/movable/M)
+	. = ..()
+
+	if(istype(M, /obj/singularity))
+		. = FALSE
+
 /obj/effect/portal/wormhole/teleport(atom/movable/M)
-	if(!istype(M))
-		return FALSE
-
-	if(!M.simulated || iseffect(M))
-		return FALSE
-
-	if(M.anchored && ismecha(M))
+	if(!can_teleport(M))
 		return FALSE
 
 	var/turf/target

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -594,7 +594,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm
 	qdel(src)
 
 /obj/item/honkbot_arm_assembly
-	name = "incomplete honkbot assembly."
+	name = "incomplete honkbot assembly"
 	desc = "A clown box with a robot arm permanently grafted to it."
 	icon = 'icons/obj/aibots.dmi'
 	icon_state = "honkbot_arm"
@@ -625,8 +625,8 @@ var/robot_arm = /obj/item/robot_parts/l_arm
 		if(istype(W, /obj/item/instrument/trombone))
 			if(!user.unEquip(W))
 				return
-			to_chat(user, "<span class='notice'>You add the trombone to [src]! Heeeenk! </span>")
+			to_chat(user, "<span class='notice'>You add the trombone to [src]! Heeeenk!</span>")
 			qdel(W)
-			var/mob/living/simple_animal/bot/honkbot/A = new /mob/living/simple_animal/bot/honkbot(T)
+			var/mob/living/simple_animal/bot/honkbot/A = new /mob/living/simple_animal/bot/honkbot(get_turf(src))
 			A.robot_arm = robot_arm
 			qdel(src)

code/modules/mob/living/simple_animal/bot/honkbot.dm

@@ -37,7 +37,7 @@
 	. = ..()
 	update_icon()
 	auto_patrol = TRUE
-	var/datum/job/clown/J = new/datum/job/clown
+	var/datum/job/clown/J = new /datum/job/clown()
 	access_card.access += J.get_access()
 	prev_access = access_card.access
 

code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm

@@ -64,7 +64,7 @@
 		..()
 
 /mob/living/simple_animal/hostile/asteroid/gutlunch/AttackingTarget()
-	if(is_type_in_list(target, wanted_objects)) //we eats
+	if(is_type_in_typecache(target, wanted_objects)) //we eats
 		udder.generateMilk()
 		regenerate_icons()
 		visible_message("<span class='notice'>[src] slurps up [target].</span>")