From a40df7dda7d0bcdff46b103c10b5af9a8f255ffa Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 20 Mar 2020 00:35:55 -0400 Subject: [PATCH] Earlyports some bugfixes --- code/defines/obj.dm | 2 +- code/game/objects/items/toys.dm | 4 ++-- code/modules/mob/living/carbon/human/life.dm | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 1f3a7257c9..293ea99e7f 100644 --- a/code/defines/obj.dm +++ b/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) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a54c7e5c7b..9760e2da8a 100644 --- a/code/game/objects/items/toys.dm +++ b/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, "You can see something in there...") /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]!") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 537f83002d..e4127c9a02 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/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