Earlyports some bugfixes

code/defines/obj.dm

@@ -124,7 +124,7 @@ var/global/list/PDA_Manifest = list()
 			if(depthead && car.len != 1)
 				car.Swap(1,car.len)
 
-		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CARGO))
+		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CIVILIAN))
 			civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive)
 			department = 1
 			if(depthead && civ.len != 1)

code/game/objects/items/toys.dm

@@ -902,7 +902,7 @@
 /obj/structure/plushie/attack_hand(mob/user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 
-	if(stored_item && !searching)
+	if(stored_item && opened && !searching)
 		searching = TRUE
 		if(do_after(user, 10))
 			to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!")
@@ -999,7 +999,7 @@
 			to_chat(user, "<i>You can see something in there...</i>")
 
 /obj/item/toy/plushie/attack_self(mob/user as mob)
-	if(stored_item && !searching)
+	if(stored_item && opened && !searching)
 		searching = TRUE
 		if(do_after(user, 10))
 			to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!")

code/modules/mob/living/carbon/human/life.dm

@@ -1523,7 +1523,6 @@
 	else
 		shock_stage = min(shock_stage, 160)
 		shock_stage = max(shock_stage-1, 0)
-		return
 
 	if(stat)
 		return 0