From baec8f15d1d1414ef351601fe82b35bb388afbf9 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Tue, 10 Nov 2015 20:14:19 +0100 Subject: [PATCH] Changes to Pushing Mechanics --- code/modules/mob/living/living.dm | 3 +++ html/changelogs/Hubblenaut-dev.yml | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 97f4842b29f..88193d18956 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -98,6 +98,9 @@ default behaviour is: if(!can_move_mob(tmob, 0, 0)) now_pushing = 0 return + if(a_intent == I_HELP || src.restrained()) + now_pushing = 0 + return if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(40) && !(FAT in src.mutations)) src << "You fail to push [tmob]'s fat ass out of the way." diff --git a/html/changelogs/Hubblenaut-dev.yml b/html/changelogs/Hubblenaut-dev.yml index 5c87376685a..a72817b42fd 100644 --- a/html/changelogs/Hubblenaut-dev.yml +++ b/html/changelogs/Hubblenaut-dev.yml @@ -33,7 +33,4 @@ delete-after: True # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Light replacers can be refilled by clicking on a storage item." - - tweak: "Light replacers now hold up to 32 light bulbs." - - tweak: "Light replacers can be obtained through janitorial supply crates." - - tweak: "A sheet of glass fills the light replacer by 16 bulbs." + - tweak: "Mobs on help intent will not push others that aren't."