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

clears a merge conflict

Browse Source
This commit is contained in:
Poojawa
2019-10-17 05:37:44 -05:00
parent 4ee608e0c7
commit 4fdddc7b4d
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/blood.dm
-3
View File
@@ -283,7 +283,6 @@
drop.drips++ drop.drips++
drop.add_overlay(pick(drop.random_icon_states)) drop.add_overlay(pick(drop.random_icon_states))
drop.transfer_mob_blood_dna(src) drop.transfer_mob_blood_dna(src)
// src.transfer_blood_to(drop, 2)
drop.update_icon() drop.update_icon()
return return
else else
@@ -293,7 +292,6 @@
else else
drop = new(T, get_static_viruses()) drop = new(T, get_static_viruses())
drop.transfer_mob_blood_dna(src) drop.transfer_mob_blood_dna(src)
// src.transfer_blood_to(drop, 2)
drop.update_icon() drop.update_icon()
return return
@@ -304,7 +302,6 @@
if(B.bloodiness < MAX_SHOE_BLOODINESS) //add more blood, up to a limit if(B.bloodiness < MAX_SHOE_BLOODINESS) //add more blood, up to a limit
B.bloodiness += BLOOD_AMOUNT_PER_DECAL B.bloodiness += BLOOD_AMOUNT_PER_DECAL
B.transfer_mob_blood_dna(src) //give blood info to the blood decal. B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
// src.transfer_blood_to(B, 10) //very heavy bleeding, should logically leave larger pools
if(temp_blood_DNA) if(temp_blood_DNA)
B.blood_DNA |= temp_blood_DNA B.blood_DNA |= temp_blood_DNA