cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16798 from SabreML/telescopic-blood-overlays

Browse Source 
Blood overlay fix for telescopic weapons
This commit is contained in:
Fox McCloud
2021-09-28 00:31:41 -04:00
committed by GitHub
parent eef189cb61 51c2c8840d
commit 0eac5b812c
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/hydroitemdefines.dm
+21 -9
View File
@@ -206,16 +206,28 @@
H.update_inv_l_hand()
H.update_inv_r_hand()
add_fingerprint(user)
if(!blood_DNA)
return
if(blood_overlay && (blood_DNA.len >= 1)) //updated blood overlay, if any
overlays.Cut() //this might delete other item overlays as well but eeeeeh
if(blood_overlay) //updated blood overlay, if any
var/blood_color = blood_overlay.color
cut_overlay(blood_overlay)
qdel(blood_overlay)
add_blood_overlay(blood_color)
var/icon/I = new /icon(icon, icon_state)
I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)), ICON_ADD)
I.Blend(new /icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY)
blood_overlay = I
overlays += blood_overlay
/obj/item/scythe/tele/blood_splatter_index()
return "\ref[icon]-[icon_state]"
/obj/item/scythe/tele/add_blood_overlay(color)
var/index = blood_splatter_index()
var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
if(!blood_splatter_icon)
blood_splatter_icon = icon(icon, icon_state)
blood_splatter_icon.Blend("#ffffff", ICON_ADD)
blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY)
blood_splatter_icon = fcopy_rsc(blood_splatter_icon)
GLOB.blood_splatter_icons[index] = blood_splatter_icon
blood_overlay = image(blood_splatter_icon)
blood_overlay.color = color
add_overlay(blood_overlay)
// *************************************