From 17488480b19adaf0d91ae5cbece8efc199660f88 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 4 Mar 2020 22:43:30 +0100 Subject: [PATCH 1/2] Allows blobbernauts to drag objects (but not mobs) again. --- code/modules/antagonists/blob/blob/blobs/blob_mobs.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm index 182fcea0c2..ff6c483227 100644 --- a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm @@ -218,11 +218,16 @@ /mob/living/simple_animal/hostile/blob/blobbernaut/Initialize() . = ..() - if(!independent) //no pulling people deep into the blob - verbs -= /mob/living/verb/pulled - else + if(independent) pass_flags &= ~PASSBLOB +/mob/living/simple_animal/hostile/blob/blobbernaut/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE) + if(!independent && ismob(AM)) + if(!suppress_message) + to_chat(src, "You are unable to grasp people in this form.") + return FALSE + return ..() + /mob/living/simple_animal/hostile/blob/blobbernaut/Life() if(..()) var/list/blobs_in_area = range(2, src) From 9eedf8c1fb74129582b4a6d8b9b94e81ddd83da5 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 4 Mar 2020 23:34:59 +0100 Subject: [PATCH 2/2] Update blob_mobs.dm --- code/modules/antagonists/blob/blob/blobs/blob_mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm index ff6c483227..261677a74b 100644 --- a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm @@ -223,7 +223,7 @@ /mob/living/simple_animal/hostile/blob/blobbernaut/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE) if(!independent && ismob(AM)) - if(!suppress_message) + if(!supress_message) to_chat(src, "You are unable to grasp people in this form.") return FALSE return ..()