reverts the add_blood back to add_blood_DNA

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
@@ -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()
@@ -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*"))
. = ..()
@@ -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
@@ -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")
@@ -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()
-2
View File
@@ -24,8 +24,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/icon/alternate_worn_icon = null//If this is set, update_icons() will find on mob (WORN, NOT INHANDS) states in this file instead, primary use: badminnery/events
var/alternate_worn_layer = null//If this is set, update_icons() will force the on mob state (WORN, NOT INHANDS) onto this layer, instead of it's default
max_integrity = 200
obj_flags = NONE
@@ -136,7 +136,7 @@
else
icon_state = initial(icon_state)
/obj/item/radio/intercom/add_blood(list/blood_dna)
/obj/item/radio/intercom/add_blood_DNA(list/blood_dna)
return FALSE
//Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
+1 -1
View File
@@ -25,7 +25,7 @@
user.visible_message("<span class='suicide'>[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!</span>")
return (BRUTELOSS|FIRELOSS)
/obj/item/melee/transforming/energy/add_blood(list/blood_dna)
/obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
return FALSE
/obj/item/melee/transforming/energy/is_sharp()
+1 -1
View File
@@ -369,7 +369,7 @@
else
shard.consume_turf(target)
/obj/item/melee/supermatter_sword/add_blood(list/blood_dna)
/obj/item/melee/supermatter_sword/add_blood_DNA(list/blood_dna)
return FALSE
/obj/item/melee/curator_whip
+1 -1
View File
@@ -389,7 +389,7 @@
. = ..()
/obj/item/stack/proc/copy_evidences(obj/item/stack/from)
add_blood(from.return_blood_DNA())
add_blood_DNA(from.return_blood_DNA())
add_fingerprint_list(from.return_fingerprints())
add_hiddenprint_list(from.return_hiddenprints())
fingerprintslast = from.fingerprintslast
+1 -1
View File
@@ -242,5 +242,5 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
else
return ..(M,user,heal_mode = FALSE)
/obj/item/storage/book/bible/syndicate/add_blood(list/blood_dna)
/obj/item/storage/book/bible/syndicate/add_blood_DNA(list/blood_dna)
return FALSE