From cae8bd68bf6700592884e530bacc5e0fe4c0d7cd Mon Sep 17 00:00:00 2001 From: Krausus Date: Tue, 19 May 2015 14:25:38 -0400 Subject: [PATCH 1/2] Fixes exchange objectives, probably This should at least fix the runtime spam --- code/game/gamemodes/objective.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index e4061a3ff29..bf84efd2a99 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -648,7 +648,7 @@ datum/objective/steal/exchange else if(faction == "blue") targetinfo = new /datum/theft_objective/unique/docs_red explanation_text = "Acquire [targetinfo.name] held by [target.current.real_name], the [target.assigned_role] and syndicate agent" - steal_target = targetinfo.typepath + steal_target = targetinfo datum/objective/steal/exchange/backstab @@ -659,7 +659,7 @@ datum/objective/steal/exchange/backstab else if(faction == "blue") targetinfo = new /datum/theft_objective/unique/docs_blue explanation_text = "Do not give up or lose [targetinfo.name]." - steal_target = targetinfo.typepath + steal_target = targetinfo datum/objective/download proc/gen_amount_goal() From f2cf32681e84aa39b35a85644a69baf10c17f76d Mon Sep 17 00:00:00 2001 From: Krausus Date: Tue, 19 May 2015 14:44:58 -0400 Subject: [PATCH 2/2] Fixes restore_blood() This is used by changeling abilities to refill blood. It wasn't doing so. --- code/modules/mob/living/carbon/human/human_damage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index cf74bb7e96a..9469b36aec6 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -245,7 +245,7 @@ This function restores the subjects blood to max. */ /mob/living/carbon/human/proc/restore_blood() - if(!species.flags & NO_BLOOD) + if(!(species.flags & NO_BLOOD)) var/blood_volume = vessel.get_reagent_amount("blood") vessel.add_reagent("blood",560.0-blood_volume)