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

Refactors Item Blood Overlays (#16826)

Browse Source 
* Refactors Item Blood Overlays

* update

* remove blood color changing
This commit is contained in:
Fox McCloud
2021-10-01 16:57:54 -04:00
committed by GitHub
parent 5db2b348ff
commit ee22c8d4ee
6 changed files with 29 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/hydroitemdefines.dm
-23
View File
@@ -206,29 +206,6 @@
H.update_inv_l_hand()
H.update_inv_r_hand()
add_fingerprint(user)
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)
/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)
// *************************************
// Nutrient defines for hydroponics
code/modules/mob/living/carbon/human/species/slime.dm
+2 -3
View File
@@ -88,9 +88,8 @@
/datum/species/slime/proc/blend(mob/living/carbon/human/H)
var/new_color = BlendRGB(H.skin_colour, "#acacac", 0.5) // Blends this to make it work better
if(H.blood_color != new_color) // Put here, so if it's a roundstart, dyed, or CMA'd slime, their blood changes to match skin
H.blood_color = new_color
H.dna.species.blood_color = H.blood_color
if(H.dna.species.blood_color != new_color) // Put here, so if it's a roundstart, dyed, or CMA'd slime, their blood changes to match skin
H.dna.species.blood_color = new_color
/datum/species/slime/handle_life(mob/living/carbon/human/H)
// Slowly shifting to the color of the reagents