Revert "fuckit, I'm just gunna wholesale port from baycode I guess"

This reverts commit 11d10d3805.
2019-06-06 19:39:22 -05:00
parent 2606dd0cdd
commit 6b82c985ae
21 changed files with 361 additions and 102 deletions
@@ -17,7 +17,7 @@
 	var/adjusted = NORMAL_STYLE
 	mutantrace_variation = MUTANTRACE_VARIATION

-	var/move_trail = /obj/effect/decal/cleanable/blood/tracks/shoe
+	var/move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/shoe

 /obj/item/clothing/shoes/suicide_act(mob/living/carbon/user)
 	if(rand(2)>1)
@@ -91,6 +91,7 @@

 /obj/item/clothing/shoes/clean_blood()
 	..()
+	blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
 	blood_state = BLOOD_STATE_NOT_BLOODY
 	blood_color = null
 	if(ismob(loc))
@@ -77,7 +77,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/fixed_mut_color3 = ""
 	var/whitelisted = 0 		//Is this species restricted to certain players?
 	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
-	var/obj/effect/decal/cleanable/blood/tracks/move_trail = /obj/effect/decal/cleanable/blood/tracks/shoe // What marks are left when walking
+	var/obj/effect/decal/cleanable/blood/footprints/tracks/move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/shoe // What marks are left when walking

 ///////////
 // PROCS //
@@ -643,9 +643,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)

 		if(H.dna.features["taur"] != "None")
 			if(H.dna.features["taur"] in GLOB.noodle_taurs)
-				move_trail = /obj/effect/decal/cleanable/blood/tracks/snake
+				move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/snake
 			else if(H.dna.features["taur"] in GLOB.paw_taurs)
-				move_trail = /obj/effect/decal/cleanable/blood/tracks/paw
+				move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/paw

 //END EDIT

@@ -941,7 +941,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 // Impliments different trails for species depending on if they're wearing shoes.
 /datum/species/proc/get_move_trail(var/mob/living/carbon/human/H)
 	if(H.lying)
-		return /obj/effect/decal/cleanable/blood/tracks/body
+		return /obj/effect/decal/cleanable/blood/footprints/tracks/body
 	if(H.shoes || (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)))
 		var/obj/item/clothing/shoes/shoes = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) ? H.wear_suit : H.shoes // suits take priority over shoes
 		return shoes.move_trail
@@ -10,7 +10,7 @@
 	blacklisted = 1
 	limbs_id = "human"
 	skinned_type = /obj/item/stack/sheet/animalhide/human
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 	var/datum/action/innate/flight/fly

@@ -9,7 +9,7 @@
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	disliked_food = GROSS | RAW
 	liked_food = JUNKFOOD | FRIED
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 /datum/species/human/qualifies_for_rank(rank, list/features)
 	return TRUE	//Pure humans are always allowed in all roles.
@@ -18,7 +18,7 @@
 	coldmod = 6   // = 3x cold damage
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
 	if(regenerate_limbs)
@@ -73,7 +73,7 @@
 /datum/species/lizard/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
 	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
 		species_traits += DIGITIGRADE
-		move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
+		move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/claw
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(FALSE)
 	return ..()
@@ -81,7 +81,7 @@
 /datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
 	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Normal Legs")
 		species_traits -= DIGITIGRADE
-		move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+		move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(TRUE)

@@ -97,7 +97,7 @@
 	mutantlungs = /obj/item/organ/lungs/ashwalker
 	burnmod = 0.9
 	brutemod = 0.9
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/claw

 /datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
 	if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
@@ -15,7 +15,7 @@
 	disliked_food = FRUIT | GROSS
 	toxic_food = MEAT | RAW
 	mutanteyes = /obj/item/organ/eyes/moth
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/claw

 /datum/species/moth/on_species_gain(mob/living/carbon/C)
 	. = ..()
@@ -21,7 +21,7 @@
 	var/internal_fire = FALSE //If the bones themselves are burning clothes won't help you much
 	disliked_food = FRUIT
 	liked_food = VEGETABLES
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 /datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
 	var/datum/gas_mixture/environment = H.loc.return_air()
@@ -17,7 +17,7 @@
 	var/light_oxyheal = 1
 	var/light_burnheal = 1
 	var/light_bruteheal = 1
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -13,7 +13,7 @@
 	damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
 	disliked_food = NONE
 	liked_food = GROSS | MEAT | RAW
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 /datum/species/skeleton/check_roundstart_eligible()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
@@ -15,7 +15,7 @@
 	var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg')
 	disliked_food = NONE
 	liked_food = GROSS | MEAT | RAW
-	move_trail = /obj/effect/decal/cleanable/blood/tracks/foot
+	move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/foot

 /datum/species/zombie/check_roundstart_eligible()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
@@ -276,7 +276,7 @@ There are several things that need to be remembered:
 		var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_SHOES]
 		inv.update_icon()

-	if(!shoes)
+	if(!shoes && bloody_feet)
 		var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyfeet", -SHOES_LAYER, color = blood_DNA_to_color())
 		if(dna.features["taur"] != "None")
 			if(dna.features["taur"] in GLOB.noodle_taurs)
@@ -192,6 +192,7 @@

 	if(blood)
 		target_types += /obj/effect/decal/cleanable/blood
+		target_types += /obj/effect/decal/cleanable/trail_holder

 	if(pests)
 		target_types += /mob/living/simple_animal/cockroach