From c65e551c073de6e25995d918b84507c831ec08ae Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 17 Apr 2019 06:01:59 -0500 Subject: [PATCH] makes travis shutup --- .../effects/decals/cleanable/humans.dm | 26 +++++++++---------- .../mob/living/carbon/human/human_movement.dm | 12 ++++----- .../mob/living/simple_animal/bot/mulebot.dm | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 46928078e3..3126142733 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -145,7 +145,7 @@ //BLOODY FOOTPRINTS -/obj/effect/decal/cleanable/blood/tracks +/obj/effect/decal/cleanable/blood/footprints name = "tracks" icon = 'icons/effects/fluidtracks.dmi' icon_state = "nothingwhatsoever" @@ -156,7 +156,7 @@ var/print_state = FOOTPRINT_SHOE //the icon state to load images from var/list/shoe_types = list() -/obj/effect/decal/cleanable/blood/tracks/Crossed(atom/movable/O) +/obj/effect/decal/cleanable/blood/footprints/tracks/Crossed(atom/movable/O) ..() if(ishuman(O)) var/mob/living/carbon/human/H = O @@ -168,7 +168,7 @@ entered_dirs |= H.dir update_icon() -/obj/effect/decal/cleanable/blood/tracks/Uncrossed(atom/movable/O) +/obj/effect/decal/cleanable/blood/footprints/tracks/Uncrossed(atom/movable/O) ..() if(ishuman(O)) var/mob/living/carbon/human/H = O @@ -181,7 +181,7 @@ update_icon() -/obj/effect/decal/cleanable/blood/tracks/update_icon() +/obj/effect/decal/cleanable/blood/footprints/tracks/update_icon() cut_overlays() for(var/Ddir in GLOB.cardinals) @@ -198,7 +198,7 @@ alpha = BLOODY_FOOTPRINT_BASE_ALPHA+bloodiness -/obj/effect/decal/cleanable/blood/tracks/examine(mob/user) +/obj/effect/decal/cleanable/blood/footprints/tracks/examine(mob/user) . = ..() if(shoe_types.len) . += "You recognise the footprints as belonging to:\n" @@ -208,50 +208,50 @@ to_chat(user, .) -/obj/effect/decal/cleanable/blood/tracks/replace_decal(obj/effect/decal/cleanable/C) +/obj/effect/decal/cleanable/blood/footprints/tracks/replace_decal(obj/effect/decal/cleanable/C) if(blood_state != C.blood_state) //We only replace footprints of the same type as us return if(color != C.color) return ..() -/obj/effect/decal/cleanable/blood/tracks/can_bloodcrawl_in() +/obj/effect/decal/cleanable/blood/footprints/tracks/can_bloodcrawl_in() if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY)) return TRUE return FALSE -/obj/effect/decal/cleanable/blood/tracks/footprints +/obj/effect/decal/cleanable/blood/footprints/tracks/footprints name = "footprints" desc = "They look like tracks left by footwear." icon_state = FOOTPRINT_SHOE print_state = FOOTPRINT_SHOE -/obj/effect/decal/cleanable/blood/tracks/snake +/obj/effect/decal/cleanable/blood/footprints/tracks/snake name = "tracks" desc = "They look like tracks left by a giant snake." icon_state = FOOTPRINT_SNAKE print_state = FOOTPRINT_SNAKE -/obj/effect/decal/cleanable/blood/tracks/paw +/obj/effect/decal/cleanable/blood/footprints/tracks/paw name = "tracks" desc = "They look like tracks left by mammalian paws." icon_state = FOOTPRINT_PAW print_state = FOOTPRINT_PAW -/obj/effect/decal/cleanable/blood/tracks/claw +/obj/effect/decal/cleanable/blood/footprints/tracks/claw name = "tracks" desc = "They look like tracks left by reptilian claws." icon_state = FOOTPRINT_CLAW print_state = FOOTPRINT_CLAW -/obj/effect/decal/cleanable/blood/tracks/wheels +/obj/effect/decal/cleanable/blood/footprints/tracks/wheels name = "tracks" desc = "They look like tracks left by wheels." gender = PLURAL icon_state = FOOTPRINT_WHEEL print_state = FOOTPRINT_WHEEL -/obj/effect/decal/cleanable/blood/tracks/body +/obj/effect/decal/cleanable/blood/footprints/tracks/body name = "trails" desc = "A trail left by something being dragged." icon_state = FOOTPRINT_DRAG diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 5ef1223abe..cc5b7f392d 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -56,13 +56,13 @@ //Bloody footprints var/turf/T = get_turf(src) if(S.bloody_shoes && S.bloody_shoes[S.blood_state]) - for(var/obj/effect/decal/cleanable/blood/tracks/oldFP in T) + for(var/obj/effect/decal/cleanable/blood/footprints/tracks/oldFP in T) if (oldFP.blood_state == S.blood_state) return //No oldFP or they're all a different kind of blood S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state] - BLOOD_LOSS_PER_STEP) if (S.bloody_shoes[S.blood_state] > BLOOD_LOSS_IN_SPREAD) - var/obj/effect/decal/cleanable/blood/tracks/FP = new /obj/effect/decal/cleanable/blood/tracks/footprints(T) + var/obj/effect/decal/cleanable/blood/footprints/tracks/FP = new /obj/effect/decal/cleanable/blood/footprints/tracks/footprints(T) FP.blood_state = S.blood_state FP.entered_dirs |= dir FP.bloodiness = S.bloody_shoes[S.blood_state] - BLOOD_LOSS_IN_SPREAD @@ -81,12 +81,12 @@ return var/turf/T = get_turf(src) if(blood_smear && blood_smear[blood_state]) - for(var/obj/effect/decal/cleanable/blood/tracks/oldFP in T) + for(var/obj/effect/decal/cleanable/blood/footprints/tracks/oldFP in T) if (oldFP.blood_state == blood_state) return blood_smear[blood_state] = max(0, blood_smear[blood_state] - BLOOD_LOSS_PER_STEP) if(blood_smear[blood_state] > BLOOD_LOSS_IN_SPREAD) - var/obj/effect/decal/cleanable/blood/tracks/FP = new /obj/effect/decal/cleanable/blood/tracks/footprints(T) + var/obj/effect/decal/cleanable/blood/footprints/tracks/FP = new /obj/effect/decal/cleanable/blood/footprints/tracks/footprints(T) if(DIGITIGRADE in dna.species.species_traits) if(dna.species.id == ("lizard" || "ashwalker" || "xeno")) FP.icon_state = FOOTPRINT_CLAW @@ -120,12 +120,12 @@ return var/turf/T = get_turf(src) if(blood_smear && blood_smear[blood_state]) - for(var/obj/effect/decal/cleanable/blood/tracks/oldFP in T) + for(var/obj/effect/decal/cleanable/blood/footprints/tracks/oldFP in T) if (oldFP.blood_state == blood_state) return blood_smear[blood_state] = max(0, blood_smear[blood_state] - BLOOD_LOSS_PER_STEP) if(blood_smear[blood_state] > BLOOD_LOSS_IN_SPREAD) - var/obj/effect/decal/cleanable/blood/tracks/FP = new /obj/effect/decal/cleanable/blood/tracks/footprints(T) + var/obj/effect/decal/cleanable/blood/footprints/tracks/FP = new /obj/effect/decal/cleanable/blood/footprints/tracks/body(T) FP.icon_state = FOOTPRINT_DRAG FP.print_state = FOOTPRINT_DRAG FP.blood_state = blood_state diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index c45d435253..41ab5eb79f 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -473,7 +473,7 @@ return if(isturf(next)) if(bloodiness) - var/obj/effect/decal/cleanable/blood/tracks/B = new(loc) + var/obj/effect/decal/cleanable/blood/footprints/tracks/wheels/B = new(loc) B.add_blood_DNA(return_blood_DNA()) var/newdir = get_dir(next, loc) if(newdir == dir)