diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index f79017bd4ac..ea3a7e882e5 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -124,7 +124,7 @@ datum self.data["antibodies"] |= M:antibodies // check if the blood has antibodies that cure our disease - if(self.data["antibodies"] & M:virus2.antigen) if(prob(10)) + if (M:virus2) if((self.data["antibodies"] & M:virus2.antigen) && prob(10)) M:virus2.dead = 1 diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index b0ff1cb9df9..31369de7aee 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -174,7 +174,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(c.key == O.key) hasSubmitted = 1 if(!hasSubmitted && O.client.be_pai) - spawn question(O.client) + spawn question(O.client, origin) proc/question(var/client/C, var/mob/origin) asked.Add(C.key) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index bae8bd35e49..d3dbf4ada54 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -74,16 +74,12 @@ return else - if(isnull(I)) // Added these calls to CRASH to diagnose a runtime error that may be one of the causes of erasure errors --Abi79 - CRASH("disposal/attackby() was called, but I was nulled before calling user.drop_item()") - - var/debug_item_name = I.name + if(isnull(I)) + //CRASH("disposal/attackby() was called, but I was nulled before calling user.drop_item()") + return // No idea why, but somehow I gets nulled before it goes into the else, and that leads to a lot of spam with runtime errors. user.drop_item() - if(isnull(I)) - CRASH("disposal/attackby() was called with [debug_item_name] as I, but I was nulled after calling user.drop_item()") - I.loc = src user << "You place \the [I] into the [src]." for(var/mob/M in viewers(src))