From 4324d08f321b475ee9a2e2189d4927af6f9a786d Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 22 May 2019 04:52:21 -0500 Subject: [PATCH] aaaaAAAAAAAA NOW WHY DO I HAVE INFINITE FOOTPRINTS AAAAAAAAAAAAA --- code/game/objects/effects/decals/cleanable/gibs.dm | 3 --- code/game/objects/effects/decals/cleanable/humans.dm | 5 ----- code/game/objects/effects/spawners/gibspawner.dm | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/code/game/objects/effects/decals/cleanable/gibs.dm b/code/game/objects/effects/decals/cleanable/gibs.dm index 7a36ce8f7a..09b0ea034a 100644 --- a/code/game/objects/effects/decals/cleanable/gibs.dm +++ b/code/game/objects/effects/decals/cleanable/gibs.dm @@ -46,11 +46,8 @@ GET_COMPONENT(infective, /datum/component/infective) if(infective) diseases = infective.diseases - var/obj/effect/decal/cleanable/blood/gibs/gibbers = src var/obj/effect/decal/cleanable/blood/splatter/splat = new /obj/effect/decal/cleanable/blood/splatter(loc, diseases) splat.transfer_blood_dna(blood_DNA) - splat.color = gibbers.blood_color - splat.blood_color = gibbers.blood_color if(!step_to(src, get_step(src, direction), 0)) break diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 0bfec90afd..b4caf1230d 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -91,7 +91,6 @@ var/obj/item/clothing/shoes/S = H.shoes if(S && S.blood_smear[blood_state]) S.blood_smear[blood_state] = max(S.blood_smear[blood_state] - BLOOD_LOSS_PER_STEP, 0) - S.blood_color = blood_color shoe_types |= S.type if (!(entered_dirs & H.dir)) entered_dirs |= H.dir @@ -100,7 +99,6 @@ else if(H.bloodiness && H.blood_smear[blood_state]) H.blood_smear[blood_state] = max(H.blood_smear[blood_state] - BLOOD_LOSS_PER_STEP, 0) H.bloodiness = H.bloodinessmax - H.blood_color = blood_color if (!(entered_dirs & H.dir)) entered_dirs |= H.dir update_icon() @@ -115,7 +113,6 @@ if(color != bloodtype_to_color(S.last_bloodtype))//last entry - we check its color return S.blood_smear[blood_state] = max(S.blood_smear[blood_state] - BLOOD_LOSS_PER_STEP, 0) - S.blood_color = blood_color shoe_types |= S.type if (!(exited_dirs & H.dir)) exited_dirs |= H.dir @@ -124,7 +121,6 @@ else if(H.bloodiness && H.blood_smear[blood_state]) H.blood_smear[blood_state] = max(H.blood_smear[blood_state] - BLOOD_LOSS_PER_STEP, 0) H.bloodiness = H.bloodinessmax - H.blood_color = blood_color if (!(exited_dirs & H.dir)) exited_dirs |= H.dir update_icon() @@ -146,7 +142,6 @@ add_overlay(bloodstep_overlay) alpha = BLOODY_FOOTPRINT_BASE_ALPHA + bloodiness - color = blood_color /obj/effect/decal/cleanable/blood/footprints/tracks/examine(mob/user) diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 0cb17f11be..bd49c44dd2 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -74,7 +74,8 @@ gib.blood_DNA += dna_to_add // color them properly, please. - gib.body_colors = body_coloring + if(gib.gib_overlay) + gib.body_colors = body_coloring gib.update_icon() var/list/directions = gibdirections[i]