From cbce925372e1c2881c73b8b5daef37099985a691 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 6 Jun 2019 06:49:08 +0200 Subject: [PATCH 1/4] Fix gutlunches not eating --- .../modules/mob/living/simple_animal/hostile/mining/gutlunch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm index d73fe3ca77c..6e5c840a401 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm +++ b/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("[src] slurps up [target].") From 250ca032c42c540cadf7b638edaeb858429e4272 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 6 Jun 2019 17:14:34 +0200 Subject: [PATCH 2/4] Tesla wormhole fix --- code/game/objects/effects/portals.dm | 12 +++++++++--- code/modules/events/wormholes.dm | 14 +++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index a4020af9d0d..691ed994875 100644 --- a/code/game/objects/effects/portals.dm +++ b/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) diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index c92ec910cdc..811eed6b9de 100644 --- a/code/modules/events/wormholes.dm +++ b/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 From 5110112c588b54d8a9a25254ac831c03834de1af Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 6 Jun 2019 18:57:17 +0200 Subject: [PATCH 3/4] Fix honkbot construction --- code/modules/mob/living/simple_animal/bot/construction.dm | 8 ++++---- code/modules/mob/living/simple_animal/bot/honkbot.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 77eb74e5696..3ad7c58df8e 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/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" @@ -618,15 +618,15 @@ var/robot_arm = /obj/item/robot_parts/l_arm if(!user.unEquip(W)) return build_step++ - to_chat(user, "You add the bikehorn to [src]! Honk!") + to_chat(user, "You add the bikehorn to [src] Honk!") desc = "A clown box with a robot arm and a bikehorn permanently grafted to it. It needs a trombone to be finished" qdel(W) else if(build_step == 2) if(istype(W, /obj/item/instrument/trombone)) if(!user.unEquip(W)) return - to_chat(user, "You add the trombone to [src]! Heeeenk! ") + to_chat(user, "You add the trombone to [src]! Heeeenk!") 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) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 958f493e309..45b10950669 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/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 From f7c96702f20db2d81b54838e378a6a4a737546de Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Fri, 7 Jun 2019 04:13:53 +0200 Subject: [PATCH 4/4] Fix exclamation point --- code/modules/mob/living/simple_animal/bot/construction.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 3ad7c58df8e..5feebb53059 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -618,7 +618,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm if(!user.unEquip(W)) return build_step++ - to_chat(user, "You add the bikehorn to [src] Honk!") + to_chat(user, "You add the bikehorn to [src]! Honk!") desc = "A clown box with a robot arm and a bikehorn permanently grafted to it. It needs a trombone to be finished" qdel(W) else if(build_step == 2)