diff --git a/src/openrct2/actions/GameActionCompat.cpp b/src/openrct2/actions/GameActionCompat.cpp
index 6e2158dbc4..5b36957862 100644
--- a/src/openrct2/actions/GameActionCompat.cpp
+++ b/src/openrct2/actions/GameActionCompat.cpp
@@ -205,33 +205,33 @@ extern "C"
 
 #pragma region GuestSetName
 
-	void guest_set_name(uint16 spriteIndex, const char *name)
-	{
-		auto gameAction = GuestSetNameAction(spriteIndex, name);
-		GameActions::Execute(&gameAction);
-	}
+    void guest_set_name(uint16 spriteIndex, const char *name)
+    {
+        auto gameAction = GuestSetNameAction(spriteIndex, name);
+        GameActions::Execute(&gameAction);
+    }
 
-	/**
-	*
-	*  rct2: 0x00698D6C
-	*/
-	void game_command_set_guest_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) {
-		Guard::Assert(false, "GAME_COMMAND_SET_GUEST_NAME DEPRECATED");
-	}
+    /**
+    *
+    *  rct2: 0x00698D6C
+    */
+    void game_command_set_guest_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) {
+        Guard::Assert(false, "GAME_COMMAND_SET_GUEST_NAME DEPRECATED");
+    }
 
 #pragma endregion
 
 #pragma region StaffSetName
 
-	void staff_set_name(uint16 spriteIndex, const char *name)
-	{
-		auto gameAction = StaffSetNameAction(spriteIndex, name);
-		GameActions::Execute(&gameAction);
-	}
+    void staff_set_name(uint16 spriteIndex, const char *name)
+    {
+        auto gameAction = StaffSetNameAction(spriteIndex, name);
+        GameActions::Execute(&gameAction);
+    }
 
-	void game_command_set_staff_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) {
-		Guard::Assert(false, "GAME_COMMAND_SET_STAFF_NAME DEPRECATED");
-	}
+    void game_command_set_staff_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) {
+        Guard::Assert(false, "GAME_COMMAND_SET_STAFF_NAME DEPRECATED");
+    }
 
 #pragma endregion
 
diff --git a/src/openrct2/actions/GameActionRegistration.cpp b/src/openrct2/actions/GameActionRegistration.cpp
index 40201ff24c..3965b1ed8c 100644
--- a/src/openrct2/actions/GameActionRegistration.cpp
+++ b/src/openrct2/actions/GameActionRegistration.cpp
@@ -34,7 +34,7 @@ namespace GameActions
         Register<RideSetStatusAction>();
         Register<RideSetNameAction>();
         Register<RideDemolishAction>();
-		Register<GuestSetNameAction>();
-		Register<StaffSetNameAction>();
+        Register<GuestSetNameAction>();
+        Register<StaffSetNameAction>();
     }
 }
diff --git a/src/openrct2/actions/GuestSetNameAction.hpp b/src/openrct2/actions/GuestSetNameAction.hpp
index 03326bd0b3..2cd246138c 100644
--- a/src/openrct2/actions/GuestSetNameAction.hpp
+++ b/src/openrct2/actions/GuestSetNameAction.hpp
@@ -28,100 +28,100 @@
 struct GuestSetNameAction : public GameActionBase<GAME_COMMAND_SET_GUEST_NAME, GameActionResult>
 {
 private:
-	uint16 _spriteIndex;
-	std::string _name;
+    uint16 _spriteIndex;
+    std::string _name;
 
 public:
-	GuestSetNameAction() {}
-	GuestSetNameAction(uint16 spriteIndex, const std::string& name)
-		: _spriteIndex(spriteIndex),
-		_name(name)
-	{
-	}
+    GuestSetNameAction() {}
+    GuestSetNameAction(uint16 spriteIndex, const std::string& name)
+        : _spriteIndex(spriteIndex),
+        _name(name)
+    {
+    }
 
-	uint16 GetActionFlags() const override
-	{
-		return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED;
-	}
+    uint16 GetActionFlags() const override
+    {
+        return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED;
+    }
 
-	void Serialise(DataSerialiser& stream) override
-	{
-		GameAction::Serialise(stream);
+    void Serialise(DataSerialiser& stream) override
+    {
+        GameAction::Serialise(stream);
 
-		stream << _spriteIndex << _name;
-	}
+        stream << _spriteIndex << _name;
+    }
 
-	GameActionResult::Ptr Query() const override
-	{
-		if (_spriteIndex >= MAX_SPRITES) 
-		{
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
-		}
+    GameActionResult::Ptr Query() const override
+    {
+        if (_spriteIndex >= MAX_SPRITES)
+        {
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
+        }
 
-		if (_name.empty())
-		{
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_ERR_INVALID_NAME_FOR_GUEST);
-		}
+        if (_name.empty())
+        {
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_ERR_INVALID_NAME_FOR_GUEST);
+        }
 
-		rct_peep *peep = GET_PEEP(_spriteIndex);
-		if (peep->type != PEEP_TYPE_GUEST) 
-		{
-			log_warning("Invalid game command for sprite %u", _spriteIndex);
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
-		}
+        rct_peep *peep = GET_PEEP(_spriteIndex);
+        if (peep->type != PEEP_TYPE_GUEST)
+        {
+            log_warning("Invalid game command for sprite %u", _spriteIndex);
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
+        }
 
-		rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
-		if (newUserStringId == 0)
-		{
-			// TODO: Probably exhausted, introduce new error.
-			return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
-		}
-		user_string_free(newUserStringId);
+        rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
+        if (newUserStringId == 0)
+        {
+            // TODO: Probably exhausted, introduce new error.
+            return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
+        }
+        user_string_free(newUserStringId);
 
-		return std::make_unique<GameActionResult>();
-	}
+        return std::make_unique<GameActionResult>();
+    }
 
-	GameActionResult::Ptr Execute() const override
-	{
-		rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
+    GameActionResult::Ptr Execute() const override
+    {
+        rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
 
-		rct_peep *peep = GET_PEEP(_spriteIndex);
-		if (peep->type != PEEP_TYPE_GUEST) 
-		{
-			log_warning("Invalid game command for sprite %u", _spriteIndex);
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
-		}
+        rct_peep *peep = GET_PEEP(_spriteIndex);
+        if (peep->type != PEEP_TYPE_GUEST)
+        {
+            log_warning("Invalid game command for sprite %u", _spriteIndex);
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
+        }
 
-		set_format_arg(0, uint32, peep->id);
-		utf8* curName = gCommonStringFormatBuffer;
-		rct_string_id curId = peep->name_string_idx;
-		format_string(curName, 256, curId, gCommonFormatArgs);
+        set_format_arg(0, uint32, peep->id);
+        utf8* curName = gCommonStringFormatBuffer;
+        rct_string_id curId = peep->name_string_idx;
+        format_string(curName, 256, curId, gCommonFormatArgs);
 
-		if (strcmp(curName, _name.c_str()) == 0)
-		{
-			return std::make_unique<GameActionResult>(GA_ERROR::OK, STR_NONE);
-		}
+        if (strcmp(curName, _name.c_str()) == 0)
+        {
+            return std::make_unique<GameActionResult>(GA_ERROR::OK, STR_NONE);
+        }
 
-		user_string_free(peep->name_string_idx);
-		peep->name_string_idx = newUserStringId;
+        user_string_free(peep->name_string_idx);
+        peep->name_string_idx = newUserStringId;
 
-		peep_update_name_sort(peep);
+        peep_update_name_sort(peep);
 
-		peep_handle_easteregg_name(peep);
+        peep_handle_easteregg_name(peep);
 
-		gfx_invalidate_screen();
+        gfx_invalidate_screen();
 
-		// Force guest list window refresh
-		rct_window *w = window_find_by_class(WC_GUEST_LIST);
-		if (w != NULL)
-		{
-			w->no_list_items = 0;
-		}
+        // Force guest list window refresh
+        rct_window *w = window_find_by_class(WC_GUEST_LIST);
+        if (w != NULL)
+        {
+            w->no_list_items = 0;
+        }
 
-		auto res = std::make_unique<GameActionResult>();
-		res->Position.x = peep->x;
-		res->Position.y = peep->y;
-		res->Position.z = peep->z;
-		return res;
-	}
+        auto res = std::make_unique<GameActionResult>();
+        res->Position.x = peep->x;
+        res->Position.y = peep->y;
+        res->Position.z = peep->z;
+        return res;
+    }
 };
diff --git a/src/openrct2/actions/StaffSetNameAction.hpp b/src/openrct2/actions/StaffSetNameAction.hpp
index ec6c455c80..c93cbf871d 100644
--- a/src/openrct2/actions/StaffSetNameAction.hpp
+++ b/src/openrct2/actions/StaffSetNameAction.hpp
@@ -28,100 +28,100 @@
 struct StaffSetNameAction : public GameActionBase<GAME_COMMAND_SET_STAFF_NAME, GameActionResult>
 {
 private:
-	uint16 _spriteIndex;
-	std::string _name;
+    uint16 _spriteIndex;
+    std::string _name;
 
 public:
-	StaffSetNameAction() {}
-	StaffSetNameAction(uint16 spriteIndex, const std::string& name)
-		: _spriteIndex(spriteIndex),
-		_name(name)
-	{
-	}
+    StaffSetNameAction() {}
+    StaffSetNameAction(uint16 spriteIndex, const std::string& name)
+        : _spriteIndex(spriteIndex),
+        _name(name)
+    {
+    }
 
-	uint16 GetActionFlags() const override
-	{
-		return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED;
-	}
+    uint16 GetActionFlags() const override
+    {
+        return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED;
+    }
 
-	void Serialise(DataSerialiser& stream) override
-	{
-		GameAction::Serialise(stream);
+    void Serialise(DataSerialiser& stream) override
+    {
+        GameAction::Serialise(stream);
 
-		stream << _spriteIndex << _name;
-	}
+        stream << _spriteIndex << _name;
+    }
 
-	GameActionResult::Ptr Query() const override
-	{
-		if (_spriteIndex >= MAX_SPRITES)
-		{
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
-		}
+    GameActionResult::Ptr Query() const override
+    {
+        if (_spriteIndex >= MAX_SPRITES)
+        {
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
+        }
 
-		if (_name.empty())
-		{
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_STAFF_ERROR_CANT_NAME_STAFF_MEMBER);
-		}
+        if (_name.empty())
+        {
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_STAFF_ERROR_CANT_NAME_STAFF_MEMBER);
+        }
 
-		rct_peep *peep = GET_PEEP(_spriteIndex);
-		if (peep->type != PEEP_TYPE_STAFF)
-		{
-			log_warning("Invalid game command for sprite %u", _spriteIndex);
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
-		}
+        rct_peep *peep = GET_PEEP(_spriteIndex);
+        if (peep->type != PEEP_TYPE_STAFF)
+        {
+            log_warning("Invalid game command for sprite %u", _spriteIndex);
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
+        }
 
-		rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
-		if (newUserStringId == 0)
-		{
-			// TODO: Probably exhausted, introduce new error.
-			return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
-		}
-		user_string_free(newUserStringId);
+        rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
+        if (newUserStringId == 0)
+        {
+            // TODO: Probably exhausted, introduce new error.
+            return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
+        }
+        user_string_free(newUserStringId);
 
-		return std::make_unique<GameActionResult>();
-	}
+        return std::make_unique<GameActionResult>();
+    }
 
-	GameActionResult::Ptr Execute() const override
-	{
-		rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
+    GameActionResult::Ptr Execute() const override
+    {
+        rct_string_id newUserStringId = user_string_allocate(USER_STRING_HIGH_ID_NUMBER | USER_STRING_DUPLICATION_PERMITTED, _name.c_str());
 
-		rct_peep *peep = GET_PEEP(_spriteIndex);
-		if (peep->type != PEEP_TYPE_STAFF)
-		{
-			log_warning("Invalid game command for sprite %u", _spriteIndex);
-			return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
-		}
+        rct_peep *peep = GET_PEEP(_spriteIndex);
+        if (peep->type != PEEP_TYPE_STAFF)
+        {
+            log_warning("Invalid game command for sprite %u", _spriteIndex);
+            return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
+        }
 
-		set_format_arg(0, uint32, peep->id);
-		utf8* curName = gCommonStringFormatBuffer;
-		rct_string_id curId = peep->name_string_idx;
-		format_string(curName, 256, curId, gCommonFormatArgs);
+        set_format_arg(0, uint32, peep->id);
+        utf8* curName = gCommonStringFormatBuffer;
+        rct_string_id curId = peep->name_string_idx;
+        format_string(curName, 256, curId, gCommonFormatArgs);
 
-		if (strcmp(curName, _name.c_str()) == 0)
-		{
-			return std::make_unique<GameActionResult>(GA_ERROR::OK, STR_NONE);
-		}
+        if (strcmp(curName, _name.c_str()) == 0)
+        {
+            return std::make_unique<GameActionResult>(GA_ERROR::OK, STR_NONE);
+        }
 
-		user_string_free(peep->name_string_idx);
-		peep->name_string_idx = newUserStringId;
+        user_string_free(peep->name_string_idx);
+        peep->name_string_idx = newUserStringId;
 
-		peep_update_name_sort(peep);
+        peep_update_name_sort(peep);
 
-		peep_handle_easteregg_name(peep);
+        peep_handle_easteregg_name(peep);
 
-		gfx_invalidate_screen();
+        gfx_invalidate_screen();
 
-		// Force guest list window refresh
-		rct_window *w = window_find_by_class(WC_STAFF_LIST);
-		if (w != NULL)
-		{
-			w->no_list_items = 0;
-		}
+        // Force staff list window refresh
+        rct_window *w = window_find_by_class(WC_STAFF_LIST);
+        if (w != NULL)
+        {
+            w->no_list_items = 0;
+        }
 
-		auto res = std::make_unique<GameActionResult>();
-		res->Position.x = peep->x;
-		res->Position.y = peep->y;
-		res->Position.z = peep->z;
-		return res;
-	}
+        auto res = std::make_unique<GameActionResult>();
+        res->Position.x = peep->x;
+        res->Position.y = peep->y;
+        res->Position.z = peep->z;
+        return res;
+    }
 };
diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c
index 9a2fb7aa80..7ec2b6c184 100644
--- a/src/openrct2/peep/peep.c
+++ b/src/openrct2/peep/peep.c
@@ -12638,129 +12638,129 @@ static bool peep_heading_for_ride_or_park_exit(rct_peep *peep)
 
 void peep_handle_easteregg_name(rct_peep* peep)
 {
-	peep->peep_flags &= ~PEEP_FLAGS_WAVING;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATIE_BRAYSHAW, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_WAVING;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_WAVING;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATIE_BRAYSHAW, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_WAVING;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_PHOTO;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_CHRIS_SAWYER, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_PHOTO;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_PHOTO;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_CHRIS_SAWYER, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_PHOTO;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_PAINTING;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_SIMON_FOSTER, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_PAINTING;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_PAINTING;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_SIMON_FOSTER, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_PAINTING;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_WOW;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_JOHN_WARDLEY, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_WOW;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_WOW;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_JOHN_WARDLEY, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_WOW;
+    }
 
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_MELANIE_WARN, peep))
-	{
-		peep->happiness = 250;
-		peep->happiness_target = 250;
-		peep->energy = 127;
-		peep->energy_target = 127;
-		peep->nausea = 0;
-		peep->nausea_target = 0;
-	}
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_MELANIE_WARN, peep))
+    {
+        peep->happiness = 250;
+        peep->happiness_target = 250;
+        peep->energy = 127;
+        peep->energy_target = 127;
+        peep->nausea = 0;
+        peep->nausea_target = 0;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_LITTER;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_LISA_STIRLING, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_LITTER;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_LITTER;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_LISA_STIRLING, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_LITTER;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_LOST;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_DONALD_MACRAE, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_LOST;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_LOST;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_DONALD_MACRAE, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_LOST;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_HUNGER;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATHERINE_MCGOWAN, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_HUNGER;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_HUNGER;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATHERINE_MCGOWAN, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_HUNGER;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_BATHROOM;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_FRANCES_MCGOWAN, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_BATHROOM;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_BATHROOM;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_FRANCES_MCGOWAN, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_BATHROOM;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_CROWDED;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_CORINA_MASSOURA, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_CROWDED;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_CROWDED;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_CORINA_MASSOURA, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_CROWDED;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_HAPPINESS;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_CAROL_YOUNG, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_HAPPINESS;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_HAPPINESS;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_CAROL_YOUNG, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_HAPPINESS;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_NAUSEA;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_MIA_SHERIDAN, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_NAUSEA;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_NAUSEA;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_MIA_SHERIDAN, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_NAUSEA;
+    }
 
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATIE_RODGER, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_LEAVING_PARK;
-		peep->peep_flags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
-	}
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATIE_RODGER, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_LEAVING_PARK;
+        peep->peep_flags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_PURPLE;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_EMMA_GARRELL, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_PURPLE;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_PURPLE;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_EMMA_GARRELL, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_PURPLE;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_PIZZA;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_JOANNE_BARTON, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_PIZZA;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_PIZZA;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_JOANNE_BARTON, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_PIZZA;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_CONTAGIOUS;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_FELICITY_ANDERSON, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_CONTAGIOUS;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_CONTAGIOUS;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_FELICITY_ANDERSON, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_CONTAGIOUS;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_JOY;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATIE_SMITH, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_JOY;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_JOY;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_KATIE_SMITH, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_JOY;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_ANGRY;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_EILIDH_BELL, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_ANGRY;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_ANGRY;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_EILIDH_BELL, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_ANGRY;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_ICE_CREAM;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_NANCY_STILLWAGON, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_ICE_CREAM;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_ICE_CREAM;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_NANCY_STILLWAGON, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_ICE_CREAM;
+    }
 
-	peep->peep_flags &= ~PEEP_FLAGS_HERE_WE_ARE;
-	if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_DAVID_ELLIS, peep))
-	{
-		peep->peep_flags |= PEEP_FLAGS_HERE_WE_ARE;
-	}
+    peep->peep_flags &= ~PEEP_FLAGS_HERE_WE_ARE;
+    if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_DAVID_ELLIS, peep))
+    {
+        peep->peep_flags |= PEEP_FLAGS_HERE_WE_ARE;
+    }
 }
 
 #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1