From 986c2ab97e833f290f8730d8094d73c549483837 Mon Sep 17 00:00:00 2001
From: zsilencer <zsilencergame@gmail.com>
Date: Tue, 18 Oct 2016 13:20:45 -0600
Subject: [PATCH] Fix bug - prevent firing of staff while being picked up

---
 src/peep/staff.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/peep/staff.c b/src/peep/staff.c
index 1754db250f..40568c1dea 100644
--- a/src/peep/staff.c
+++ b/src/peep/staff.c
@@ -474,6 +474,10 @@ void game_command_fire_staff_member(int *eax, int *ebx, int *ecx, int *edx, int
 			*ebx = MONEY32_UNDEFINED;
 			return;
 		}
+		if (peep->state == PEEP_STATE_PICKED) {
+			*ebx = MONEY32_UNDEFINED;
+			return;
+		}
 		remove_peep_from_ride(peep);
 		peep_sprite_remove(peep);
 	}