From 600d3519508e74bb4900f9aa3dc22cd0a0fc5722 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 2 Nov 2015 20:54:34 -0500 Subject: [PATCH] added in gib subtype --- .../effects/decals/Cleanable/humans.dm | 19 ++++++++++++++++++- code/game/objects/items/weapons/soap.dm | 2 +- code/modules/reagents/newchem/medicine.dm | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 063d7ec8bd8..1e1eff2d512 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -152,6 +152,7 @@ var/global/list/image/splatter_cache=list() icon_state = "gibbl5" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") var/fleshcolor = "#FFFFFF" + noclear = 1 /obj/effect/decal/cleanable/blood/gibs/update_icon() @@ -185,10 +186,26 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/gibs/New() ..() - noclear = 1 reagents.add_reagent("liquidgibs", 5) +/obj/effect/decal/cleanable/blood/gibs/cleangibs //most ironic name ever... + name = "gibs" + desc = "They look bloody and gruesome." + gender = PLURAL + density = 0 + anchored = 1 + layer = 2 + icon = 'icons/effects/blood.dmi' + icon_state = "gibbl5" + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") + fleshcolor = "#FFFFFF" + noclear = 1 + +/obj/effect/decal/cleanable/blood/gibs/cleangibs/New() //no reagent! + ..() + + /obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions) spawn (0) var/direction = pick(directions) diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 78d314e4c4e..02f3289dad8 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -34,7 +34,7 @@ if(do_after(user, src.cleanspeed, target = target)) user << "You 'clean' \the [target.name]." if(istype(target, /turf/simulated)) - new /obj/effect/decal/cleanable/blood/gibs(target) + new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target) else if (istype(target,/mob/living/carbon)) for(var/obj/item/carried_item in target.contents) if(!istype(carried_item, /obj/item/weapon/implant))//If it's not an implant. diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index 9905345926b..764a5407776 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -96,7 +96,7 @@ datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vo datum/reagent/synthflesh/reaction_turf(var/turf/T, var/volume) //let's make a mess! src = null if(volume >= 5) - new /obj/effect/decal/cleanable/blood/gibs(T) + new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T) playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) return