From f65649c8ba2d2bad88c07f97dd842a7ef2c9d085 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 17 Sep 2015 09:40:19 +0200 Subject: [PATCH] Fixes Pun-Pun (and other monkeys) pushing people around. At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge. Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate. --- code/modules/mob/living/carbon/human/human.dm | 4 ---- code/modules/mob/living/carbon/human/species/species.dm | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index cbc8faabd7..1ebbd792c6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1165,10 +1165,6 @@ else return 0 - mob_bump_flag = species.bump_flag - mob_swap_flags = species.swap_flags - mob_push_flags = species.push_flags - /mob/living/carbon/human/proc/bloody_doodle() set category = "IC" set name = "Write in blood" diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 9f171054b9..313fa2e1c7 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -255,6 +255,9 @@ /datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment. add_inherent_verbs(H) + H.mob_bump_flag = bump_flag + H.mob_swap_flags = swap_flags + H.mob_push_flags = push_flags /datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns). return