From 14b3dcbd65ed5de6182b1e1b54f54c93c9ac0403 Mon Sep 17 00:00:00 2001 From: CorruptComputer Date: Sun, 16 Aug 2015 16:53:33 -0500 Subject: [PATCH 1/2] deletes computerfiles.dm and minor edit to atoms.dm --- code/datums/computerfiles.dm | 7 ------- code/game/atoms.dm | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 code/datums/computerfiles.dm diff --git a/code/datums/computerfiles.dm b/code/datums/computerfiles.dm deleted file mode 100644 index 37ba1ec51e0..00000000000 --- a/code/datums/computerfiles.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum - computer - var/name - folder - var/list/datum/computer/contents = list() - - file \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index df257364a90..48e0768810f 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -284,12 +284,8 @@ var/list/blood_splatter_icons = list() var/mob/living/carbon/human/H = M if(NOBLOOD in H.dna.species.specflags) return 0 - if(rejects_blood()) + if(rejects_blood() || !istype(M) || !check_dna_integrity(M)) return 0 - if(!istype(M)) - return 0 - if(!check_dna_integrity(M)) //check dna is valid and create/setup if necessary - return 0 //no dna! return 1 /obj/add_blood(mob/living/carbon/M) From a27b781541c66c91f0efb6d1a9133bba78247c2b Mon Sep 17 00:00:00 2001 From: CorruptComputer Date: Sun, 16 Aug 2015 16:57:41 -0500 Subject: [PATCH 2/2] what the fuck, who did this? --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 7677d19fc8f..25bc98a1e2f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -153,7 +153,6 @@ #include "code\controllers\subsystem\shuttles\supply.dm" #include "code\datums\ai_laws.dm" #include "code\datums\browser.dm" -#include "code\datums\computerfiles.dm" #include "code\datums\datacore.dm" #include "code\datums\datumvars.dm" #include "code\datums\debug.dm"