Revert "lel"

This reverts commit 9e01a078ec.
This commit is contained in:
Poojawa
2019-06-06 19:40:08 -05:00
parent 6b82c985ae
commit 2e42656b6d
7 changed files with 65 additions and 44 deletions
@@ -70,7 +70,6 @@
//Add "bloodiness" of this blood's type, to the human's shoes
//This is on /cleanable because fuck this ancient mess
/obj/effect/decal/cleanable/Crossed(atom/movable/O)
..()
if(ishuman(O))
var/mob/living/carbon/human/H = O
if(H.shoes && blood_state && bloodiness && (!H.has_trait(TRAIT_LIGHT_STEP) || !H.mind.assigned_role == "Detective"))
@@ -81,7 +80,6 @@
else
add_blood = bloodiness
bloodiness -= add_blood
to_chat(world, "S.blood_state is [S.blood_state], & blood smear state is [S.blood_smear[S.blood_state]]")
S.blood_smear[blood_state] = min(MAX_SHOE_BLOODINESS,S.blood_smear[blood_state]+add_blood)
if(blood_DNA && blood_DNA.len)
S.add_blood(blood_DNA)
@@ -96,7 +94,6 @@
else
add_blood = bloodiness
bloodiness -= add_blood
to_chat(world, "blood_state is [blood_state], & blood smear state is [H.blood_smear[blood_state]]")
H.blood_smear[blood_state] = min(MAX_SHOE_BLOODINESS,H.blood_smear[blood_state]+add_blood)
if(blood_DNA && blood_DNA.len)
H.add_blood(blood_DNA)
@@ -130,7 +130,7 @@
/obj/effect/decal/cleanable/blood/footprints/tracks/update_icon()
..()
cut_overlays()
to_chat(world, "[src] called update_icon with [print_state]")
for(var/Ddir in GLOB.cardinals)
if(entered_dirs & Ddir)
var/image/bloodstep_overlay = GLOB.bloody_footprints_cache["entered-[print_state]-[Ddir]"]
-35
View File
@@ -194,44 +194,9 @@
if(O.obj_flags & FROZEN)
O.make_unfrozen()
if(isliving(A))
var/mob/living/M = A
if(ishuman(M))
var/mob/living/carbon/human/H = M
// Tracking blood
var/list/bloodDNA = null
var/bloodcolor=""
if(H.shoes)
var/obj/item/clothing/shoes/S = H.shoes
if(istype(S))
S.step_action()
if(S.track_blood && S.blood_DNA)
bloodDNA = S.blood_DNA
bloodcolor = S.blood_color
S.track_blood--
else
if(H.track_blood && H.feet_blood_DNA)
bloodDNA = H.feet_blood_DNA
bloodcolor = H.feet_blood_color
H.track_blood--
if (bloodDNA && H.species.get_move_trail(H))
src.AddTracks(H.species.get_move_trail(H),bloodDNA,H.dir,0,bloodcolor) // Coming
var/turf/simulated/from = get_step(H,reverse_direction(H.dir))
if(istype(from) && from)
from.AddTracks(H.species.get_move_trail(H),bloodDNA,0,H.dir,bloodcolor) // Going
bloodDNA = null
/turf/proc/is_plasteel_floor()
return FALSE
/turf/open/proc/AddTracks(var/typepath,var/bloodDNA,var/comingdir,var/goingdir,var/bloodcolor=COLOR_BLOOD_HUMAN)
var/obj/effect/decal/cleanable/blood/tracks/tracks = locate(typepath) in src
if(!tracks)
tracks = new typepath(src)
tracks.AddTracks(bloodDNA,comingdir,goingdir,bloodcolor)
// A proc in case it needs to be recreated or badmins want to change the baseturfs
/turf/proc/assemble_baseturfs(turf/fake_baseturf_type)
var/static/list/created_baseturf_lists = list()