From a6fbde8f2f0d0d78139ada4fe8ebffc9b8e09fe1 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 25 Apr 2014 13:31:10 -0700 Subject: [PATCH] Fixes for Mloc, part 2. --- code/game/objects/items/weapons/cigs_lighters.dm | 7 +++++-- code/game/objects/items/weapons/tools.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 36757e3d92..5ec7f97d6d 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -167,9 +167,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM location.hotspot_expose(700, 5) if(reagents && reagents.total_volume) // check if it has any reagents at all if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + if(H.species.flags & IS_SYNTHETIC) + return var/mob/living/carbon/C = loc - if(C.flags & IS_SYNTHETIC) - return + if(prob(15)) // so it's not an instarape in case of acid reagents.reaction(C, INGEST) reagents.trans_to(C, REAGENTS_METABOLISM) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 3879dbbfda..ad7ec85f14 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -357,7 +357,7 @@ if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] - if(H.flags & IS_SYNTHETIC) + if(H.species.flags & IS_SYNTHETIC) return switch(safety) if(1) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0580d55229..33c0c018bd 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -254,7 +254,7 @@ adjustToxLoss(-(rads)) updatehealth() return - if(flags & IS_SYNTHETIC) + if(species.flags & IS_SYNTHETIC) return var/damage = 0