From 5217227f9aff975d6d7a09f1726c3007d5fa1cc5 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 14 Feb 2013 14:45:52 +0100 Subject: [PATCH 1/2] Fixes issue #2309: Infected blood now infects again. --- code/modules/reagents/Chemistry-Reagents.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index acec96cba7c..3e014582c94 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -113,6 +113,12 @@ datum M.contract_disease(D) else //injected M.contract_disease(D, 1, 0) + if(self.data && self.data["virus2"]) + if(method == TOUCH) + infect_virus2(M,self.data["virus2"]) + else + infect_virus2(M,self.data["virus2"],1) + From c5301c51449fd2ac3cb0d951a201390d62ed00b0 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 14 Feb 2013 15:06:10 +0100 Subject: [PATCH 2/2] Fixes issue #2296: Humans will not react to sleep toxins in smaller amounts than can be scrubbed. --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f48a7be0df3..d34a65fdf62 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -615,7 +615,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 Paralyse(3) // 3 gives them one second to wake up and run away a bit! if(SA_pp > SA_sleep_min) // Enough to make us sleep as well sleeping = max(sleeping+2, 10) - else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning + else if(SA_pp > 0.15) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning if(prob(20)) spawn(0) emote(pick("giggle", "laugh")) SA.moles = 0