shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

just need the stupid component to work properly now

Browse Source
This commit is contained in:
Poojawa
2019-05-14 02:36:23 -05:00
parent 49a2f3cc63
commit 77abf6a179
6 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/shoes/_shoes.dm
+3 -3
View File
@@ -52,11 +52,10 @@
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
if(bloody)
GET_COMPONENT(D, /datum/component/forensics)
if(adjusted == NORMAL_STYLE)
. += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = D.blood_mix_color)
. += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = blood_color)
else
. += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = D.blood_mix_color)
. += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = blood_color)
/obj/item/clothing/shoes/equipped(mob/user, slot)
. = ..()
@@ -97,6 +96,7 @@
return
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))
var/mob/M = loc
M.update_inv_shoes()
code/modules/mob/living/blood.dm
+1 -1
View File
@@ -234,7 +234,7 @@
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(H.dna.species.exotic_blood)
return "[H.dna.species.exotic_blood]"
return H.dna.species.exotic_blood
if(dna.species.exotic_blood)
return dna.species.exotic_blood
else if((NOBLOOD in dna.species.species_traits) || (has_trait(TRAIT_NOCLONE)))
code/modules/mob/living/carbon/human/human_movement.dm
+6 -1
View File
@@ -64,6 +64,7 @@
FP.icon_state = FOOTPRINT_SHOE
FP.print_state = FOOTPRINT_SHOE
FP.blood_state = S.blood_state
FP.blood_color = S.blood_color
FP.entered_dirs |= dir
FP.bloodiness = S.blood_smear[S.blood_state]
FP.update_icon()
@@ -79,7 +80,8 @@
if(!has_gravity(loc))
return
var/turf/T = get_turf(src)
if(bloodiness)
var/mob/living/carbon/human/H = src
if(H.bloodiness)
var/obj/effect/decal/cleanable/blood/footprints/tracks/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints/tracks) in T
if(oldFP && (oldFP.blood_state == blood_state && oldFP.color == color))
return
@@ -106,6 +108,7 @@
FP.icon_state = FOOTPRINT_SHOE
FP.print_state = FOOTPRINT_SHOE
FP.add_blood_DNA(return_blood_DNA())
FP.blood_color = H.blood_color
FP.update_icon()
var/newdir = get_dir(T, loc)
if(newdir == dir)
@@ -124,6 +127,7 @@
if(!has_gravity(loc))
return
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = src
if(bloodiness)
var/obj/effect/decal/cleanable/blood/footprints/tracks/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints/tracks) in T
if(oldFP && (oldFP.blood_state == blood_state && oldFP.color == color))
@@ -133,6 +137,7 @@
FP.icon_state = FOOTPRINT_DRAG
FP.print_state = FOOTPRINT_DRAG
FP.add_blood_DNA(return_blood_DNA())
FP.blood_color = H.blood_color
FP.update_icon()
var/newdir = get_dir(T, loc)
if(newdir == dir)