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

[MIRROR] Lavaland bomb runtime fix (#5246)

Browse Source 
* Lavaland bomb runtime fix

* Update cleanable.dm
This commit is contained in:
CitadelStationBot
2018-02-05 00:56:37 -06:00
committed by Poojawa
parent 4082bcedbc
commit 662f1904aa
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable/humans.dm
+4 -5
View File
@@ -8,8 +8,8 @@
bloodiness = MAX_SHOE_BLOODINESS
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
add_blood_DNA(C.return_blood_DNA())
..()
C.add_blood_DNA(return_blood_DNA())
return ..()
/obj/effect/decal/cleanable/blood/old
name = "dried blood"
@@ -17,9 +17,9 @@
bloodiness = 0
/obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
. = ..()
icon_state += "-old" //This IS necessary because the parent /blood type uses icon randomization.
add_blood_DNA(list("Non-human DNA" = "A+"))
add_blood_DNA(list("Non-human DNA" = "A+")) // Needs to happen before ..()
return ..()
/obj/effect/decal/cleanable/blood/splatter
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
@@ -184,4 +184,3 @@
if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
return 1
return 0