From 76e8e7f0b4a29372699c7df15a55f14865e6a7c0 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Tue, 21 Sep 2010 18:58:07 +0000 Subject: [PATCH] Silicon-based lifeforms no longer explode into meaty chunks when gibbed. Cyborgs bleed motor oil when attacked. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@134 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/atom_procs.dm | 7 +++++++ code/modules/mob/mob.dm | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 2b55199e3b0..5dc968b388d 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -132,6 +132,13 @@ var/obj/decal/cleanable/xenoblood/this = new /obj/decal/cleanable/xenoblood(source2) this.virus = M.virus + else if( istype(M, /mob/living/silicon/robot )) + if( istype(src, /turf/simulated) ) + var/turf/simulated/source2 = src + var/obj/decal/cleanable/oil/this = new /obj/decal/cleanable/oil(source2) + this.virus = M.virus + + /atom/proc/clean_blood() if (!( src.flags ) & 256) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4d8128a2ef4..51ed160ae6a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1868,11 +1868,17 @@ src.mind.transfer_to(newmob) var/virus = src.virus - gibs(src.loc, virus) + if (istype(src, /mob/living/silicon)) + robogibs(src.loc, virus) + else + gibs(src.loc, virus) else if (!src.client) var/virus = src.virus - gibs(src.loc, virus) + if (istype(src, /mob/living/silicon)) + robogibs(src.loc, virus) + else + gibs(src.loc, virus) sleep(15) del(src)