Merge pull request #11240 from CorruptComputer/thisandthat

Deletes computerfiles.dm and minor edit to atoms.dm
This commit is contained in:
Remie Richards
2015-08-18 20:36:32 +01:00
3 changed files with 1 additions and 13 deletions
-7
View File
@@ -1,7 +0,0 @@
/datum
computer
var/name
folder
var/list/datum/computer/contents = list()
file
+1 -5
View File
@@ -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)
-1
View File
@@ -154,7 +154,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"