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

I think I got it.

Browse Source 
Also gibs should be better too.
This commit is contained in:
Poojawa
2019-05-12 04:06:35 -05:00
parent fcdc748bf1
commit 1a047c0068
18 changed files with 94 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/_gloves.dm
+1 -1
View File
@@ -31,7 +31,7 @@
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
IF_HAS_BLOOD_DNA(src)
GET_COMPONENT(D, /datum/component/forensics)
. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands", color = D.blood_DNA_to_color())
. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands", color = D.blood_mix_color)
/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
..()
code/modules/clothing/masks/_masks.dm
+1 -1
View File
@@ -19,7 +19,7 @@
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
IF_HAS_BLOOD_DNA(src)
GET_COMPONENT(D, /datum/component/forensics)
. += mutable_appearance('icons/effects/blood.dmi', "maskblood", color = D.blood_DNA_to_color())
. += mutable_appearance('icons/effects/blood.dmi', "maskblood", color = D.blood_mix_color)
/obj/item/clothing/mask/equipped(mob/user, slot)
..()
code/modules/clothing/shoes/_shoes.dm
+3 -2
View File
@@ -52,10 +52,11 @@
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 = blood_DNA_to_color(blood_mix_types))
. += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = D.blood_mix_color)
else
. += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = blood_DNA_to_color(blood_mix_types))
. += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = D.blood_mix_color)
/obj/item/clothing/shoes/equipped(mob/user, slot)
. = ..()
code/modules/clothing/suits/_suits.dm
+2 -2
View File
@@ -63,9 +63,9 @@
IF_HAS_BLOOD_DNA(src)
GET_COMPONENT(D, /datum/component/forensics)
if(taurmode >= SNEK_TAURIC)
. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = D.blood_DNA_to_color())
. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = D.blood_mix_color)
else
. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = D.blood_DNA_to_color())
. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = D.blood_mix_color)
var/mob/living/carbon/human/M = loc
if(ishuman(M) && M.w_uniform)
var/obj/item/clothing/under/U = M.w_uniform
code/modules/clothing/under/_under.dm
+1 -1
View File
@@ -24,7 +24,7 @@
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
IF_HAS_BLOOD_DNA(src)
GET_COMPONENT(D, /datum/component/forensics)
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = D.blood_DNA_to_color())
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = D.blood_mix_color)
if(accessory_overlay)
. += accessory_overlay
code/modules/mob/living/carbon/human/human_defines.dm
+1 -1
View File
@@ -46,7 +46,7 @@
var/bloodiness = 0
var/blood_state = BLOOD_STATE_NOT_BLOODY
var/list/blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
var/last_blood_DNA = ""//same as last one
var/blood_color //For blood smearing stuff
var/name_override //For temporary visible name changes
code/modules/mob/living/carbon/human/update_icons.dm
+1 -1
View File
@@ -185,7 +185,7 @@ There are several things that need to be remembered:
inv.update_icon()
if(!gloves && bloody_hands)
var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER)
var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER, color = blood_color)
if(get_num_arms() < 2)
if(has_left_hand())
bloody_overlay.icon_state = "bloodyhands_left"
code/modules/reagents/chemistry/reagents/other_reagents.dm
+1 -6
View File
@@ -102,12 +102,7 @@
B = new(T)
if(!B.reagents)
B.reagents.add_reagent("blood", reac_volume)
for(var/datum/reagent/R in B.reagents.reagent_list)
// Get blood data from the blood reagent.
if(istype(R, /datum/reagent/blood))
if(R.data["blood_type"])
B.blood_list_checks(src, R.data["blood_type"])
B.color = B.blood_DNA_to_color(blood_mix_types)
B.update_icon()
/datum/reagent/blood/synthetics
data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)