From 4e39bfefe75c87aa184e692d769d1c150b9cf142 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 17 Mar 2018 19:47:31 -0400 Subject: [PATCH] POLARIS: "0x32" is not a valid single-bit flag --- code/__defines/mobs.dm | 2 +- code/game/gamemodes/changeling/powers/revive.dm | 2 +- code/modules/mob/living/carbon/metroid/life.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index 9343a4590f..bb17deacf4 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -10,7 +10,7 @@ #define CANPUSH 0x8 #define LEAPING 0x10 #define HIDING 0x20 -#define PASSEMOTES 0x32 // Mob has a cortical borer or holders inside of it that need to see emotes. +#define PASSEMOTES 0x40 // Mob has a cortical borer or holders inside of it that need to see emotes. #define GODMODE 0x1000 #define FAKEDEATH 0x2000 // Replaces stuff like changeling.changeling_fakedeath. #define DISFIGURED 0x4000 // Set but never checked. Remove this sometime and replace occurences with the appropriate organ code diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index ab8111000d..0da6c3c3d5 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -33,7 +33,7 @@ H.restore_all_organs(ignore_prosthetic_prefs=1) //Covers things like fractures and other things not covered by the above. H.restore_blood() H.mutations.Remove(HUSK) - H.status_flags -= DISFIGURED + H.status_flags &= ~DISFIGURED H.update_icons_body() for(var/limb in H.organs_by_name) var/obj/item/organ/external/current_limb = H.organs_by_name[limb] diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 0f393a9417..5cf6395b7d 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -100,7 +100,7 @@ src.lying = 1 src.blinded = 1 else - if (src.paralysis || src.stunned || src.weakened || (status_flags && FAKEDEATH)) //Stunned etc. + if (src.paralysis || src.stunned || src.weakened || (status_flags & FAKEDEATH)) //Stunned etc. if (src.stunned > 0) src.stat = 0 if (src.weakened > 0)