diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index fb1b34d3c23..11d72fd9ff3 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -57,10 +57,19 @@ blood_DNA = list() //var/datum/disease2/disease/virus2 = null - Del() - for(var/datum/disease/D in viruses) - D.cure(0) - ..() +/obj/effect/decal/cleanable/blood/Del() + for(var/datum/disease/D in viruses) + D.cure(0) + ..() + +/obj/effect/decal/cleanable/blood/New() + ..() + if(istype(src, /obj/effect/decal/cleanable/blood/gibs)) + return + if(src.loc && isturf(src.loc)) + for(var/obj/effect/decal/cleanable/blood/B in src.loc) + if(B != src) + del(B) /obj/effect/decal/cleanable/blood/splatter random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5") diff --git a/tgstation.dme b/tgstation.dme index d4c07cc4495..aa77e8c211b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -179,7 +179,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" @@ -510,7 +509,6 @@ #include "code\game\machinery\computer\crew.dm" #include "code\game\machinery\computer\HolodeckControl.dm" #include "code\game\machinery\computer\hologram.dm" -#include "code\game\machinery\computer\implantmanagement.dm" #include "code\game\machinery\computer\law.dm" #include "code\game\machinery\computer\medical.dm" #include "code\game\machinery\computer\Operating.dm" @@ -693,18 +691,12 @@ #include "code\game\objects\items\weapons\tools.dm" #include "code\game\objects\items\weapons\twohanded.dm" #include "code\game\objects\items\weapons\wrappingpaper.dm" -#include "code\game\objects\items\weapons\implants\chemical.dm" -#include "code\game\objects\items\weapons\implants\emp.dm" -#include "code\game\objects\items\weapons\implants\explosive.dm" -#include "code\game\objects\items\weapons\implants\freedom.dm" -#include "code\game\objects\items\weapons\implants\health.dm" #include "code\game\objects\items\weapons\implants\implant.dm" #include "code\game\objects\items\weapons\implants\implantcase.dm" +#include "code\game\objects\items\weapons\implants\implantchair.dm" #include "code\game\objects\items\weapons\implants\implanter.dm" -#include "code\game\objects\items\weapons\implants\loyalty.dm" -#include "code\game\objects\items\weapons\implants\orange.dm" -#include "code\game\objects\items\weapons\implants\tracking.dm" -#include "code\game\objects\items\weapons\implants\uplink.dm" +#include "code\game\objects\items\weapons\implants\implantfreedom.dm" +#include "code\game\objects\items\weapons\implants\implantpad.dm" #include "code\game\objects\radio\beacon.dm" #include "code\game\objects\radio\electropack.dm" #include "code\game\objects\radio\encryptionkey.dm" @@ -1067,7 +1059,6 @@ #include "code\modules\scripting\Scanner\Tokens.dm" #include "code\modules\security levels\keycard authentication.dm" #include "code\modules\security levels\security levels.dm" -#include "code\WorkInProgress\AI_Visibility.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" #include "code\WorkInProgress\BS12\uplink_kits.dm"