From 013e591218f182f06c3926f0d324d11e25bce966 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 27 Mar 2020 20:22:22 -0600 Subject: [PATCH 1/2] Bumbles wake up sleepy head --- .../mob/living/simple_animal/friendly/bumbles.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm index 9f9ee68813..239b266c8c 100644 --- a/code/modules/mob/living/simple_animal/friendly/bumbles.dm +++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm @@ -44,19 +44,22 @@ icon_state = "[icon_living]" regenerate_icons() -/mob/living/simple_animal/pet/bumbles/bee_friendly() - return TRUE //treaty signed at the Beeneeva convention + /mob/living/simple_animal/pet/bumbles/handle_automated_movement() . = ..() - if(!isturf(loc) || !CHECK_MOBILITY(src, MOBILITY_MOVE) || buckled) - return if(!resting && prob(1)) emote("me", EMOTE_VISIBLE, pick("curls up on the surface below ", "is looking very sleepy.", "buzzes softly ", "looks around for a flower nap ")) set_resting(TRUE) else if (resting && prob(1)) emote("me", EMOTE_VISIBLE, pick("wakes up with a smiling buzz.", "rolls upside down before waking up.", "stops resting.")) set_resting(FALSE) + if(!isturf(loc) || !CHECK_MOBILITY(src, MOBILITY_MOVE) || buckled) + return + +/mob/living/simple_animal/pet/bumbles/bee_friendly() + return TRUE //treaty signed at the Beeneeva convention + /mob/living/simple_animal/pet/bumbles/update_mobility() . = ..() if(stat != DEAD) @@ -64,4 +67,4 @@ icon_state = "[icon_living]_rest" else icon_state = "[icon_living]" - regenerate_icons() + regenerate_icons() \ No newline at end of file From a85d590b1d778dfdad280d2a26611b8ebf3719f1 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 28 Mar 2020 03:35:12 +0100 Subject: [PATCH 2/2] Update bumbles.dm --- .../mob/living/simple_animal/friendly/bumbles.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm index 239b266c8c..1a78a47031 100644 --- a/code/modules/mob/living/simple_animal/friendly/bumbles.dm +++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm @@ -44,21 +44,19 @@ icon_state = "[icon_living]" regenerate_icons() - +/mob/living/simple_animal/pet/bumbles/bee_friendly() + return TRUE //treaty signed at the Beeneeva convention /mob/living/simple_animal/pet/bumbles/handle_automated_movement() . = ..() + if(!isturf(loc) || buckled) + return if(!resting && prob(1)) emote("me", EMOTE_VISIBLE, pick("curls up on the surface below ", "is looking very sleepy.", "buzzes softly ", "looks around for a flower nap ")) set_resting(TRUE) else if (resting && prob(1)) emote("me", EMOTE_VISIBLE, pick("wakes up with a smiling buzz.", "rolls upside down before waking up.", "stops resting.")) set_resting(FALSE) - if(!isturf(loc) || !CHECK_MOBILITY(src, MOBILITY_MOVE) || buckled) - return - -/mob/living/simple_animal/pet/bumbles/bee_friendly() - return TRUE //treaty signed at the Beeneeva convention /mob/living/simple_animal/pet/bumbles/update_mobility() . = ..() @@ -67,4 +65,4 @@ icon_state = "[icon_living]_rest" else icon_state = "[icon_living]" - regenerate_icons() \ No newline at end of file + regenerate_icons()