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

reverts the add_blood back to add_blood_DNA

Browse Source
This commit is contained in:
Poojawa
2019-08-15 12:49:10 -05:00
parent 0290a46ddc
commit 264cbf8108
21 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable.dm
+1 -1
View File
@@ -81,7 +81,7 @@
add_blood = bloodiness
bloodiness -= add_blood
S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS,S.bloody_shoes[blood_state]+add_blood)
S.add_blood(return_blood_DNA())
S.add_blood_DNA(return_blood_DNA())
S.blood_state = blood_state
update_icon()
H.update_inv_shoes()
code/game/objects/effects/decals/cleanable/aliens.dm
+2 -2
View File
@@ -35,7 +35,7 @@
if(infective)
diseases = infective.diseases
var/obj/effect/decal/cleanable/blood/splatter/xeno/splat = new /obj/effect/decal/cleanable/blood/splatter/xeno(loc, diseases)
splat.add_blood(return_blood_DNA())
splat.add_blood_DNA(return_blood_DNA())
if(!step_to(src, get_step(src, direction), 0))
break
@@ -68,5 +68,5 @@
random_icon_states = null
/obj/effect/decal/cleanable/blood/xtracks/Initialize()
add_blood(list("UNKNOWN DNA" = "X*"))
add_blood_DNA(list("UNKNOWN DNA" = "X*"))
. = ..()
code/game/objects/effects/decals/cleanable/gibs.dm
+2 -2
View File
@@ -16,7 +16,7 @@
if(gibs_reagent_id)
reagents.add_reagent(gibs_reagent_id, 5)
if(gibs_bloodtype)
add_blood(list("Non-human DNA" = gibs_bloodtype))
add_blood_DNA(list("Non-human DNA" = gibs_bloodtype))
update_icon()
@@ -57,7 +57,7 @@
if(infective)
diseases = infective.diseases
var/obj/effect/decal/cleanable/blood/splatter/splat = new /obj/effect/decal/cleanable/blood/splatter(loc, diseases)
splat.add_blood(return_blood_DNA())
splat.add_blood_DNA(return_blood_DNA())
if(!step_to(src, get_step(src, direction), 0))
break
code/game/objects/effects/decals/cleanable/humans.dm
+2 -2
View File
@@ -9,7 +9,7 @@
color = BLOOD_COLOR_HUMAN //default so we don't have white splotches everywhere.
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
C.add_blood(return_blood_DNA())
C.add_blood_DNA(return_blood_DNA())
if (bloodiness)
if (C.bloodiness < MAX_SHOE_BLOODINESS)
C.bloodiness += bloodiness
@@ -35,7 +35,7 @@
/obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
..()
icon_state += "-old"
add_blood(list("Non-human DNA" = "A+"))
add_blood_DNA(list("Non-human DNA" = "A+"))
/obj/effect/decal/cleanable/blood/splatter
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
code/game/objects/effects/spawners/gibspawner.dm
+1 -1
View File
@@ -74,7 +74,7 @@
digester.stomach_contents += gib
if(dna_to_add && dna_to_add.len)
gib.add_blood(dna_to_add)
gib.add_blood_DNA(dna_to_add)
gib.body_colors = body_coloring
gib.update_icon()