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

Fix tail-wagging invisible tails

Browse Source
This commit is contained in:
Tigercat2000
2015-09-06 21:49:58 -07:00
parent 3ee80a3586
commit c606f70fa0
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/body_accessories.dm
+12
View File
@@ -56,6 +56,18 @@ var/global/list/body_accessory_by_species = list("None" = null)
/datum/body_accessory/proc/get_pixel_y(var/mob/living/carbon/human/H)
return pixel_offsets["y"]
/datum/body_accessory/proc/get_animated_icon() //return animated if it has it, return static if it does not.
if(animated_icon)
return animated_icon
else return icon
/datum/body_accessory/proc/get_animated_icon_state()
if(animated_icon_state)
return animated_icon_state
else return icon_state
//Bodies
/datum/body_accessory/body
code/modules/mob/living/carbon/human/update_icons.dm
+3 -4
View File
@@ -924,11 +924,10 @@ var/global/list/damage_icon_parts = list()
overlays_standing[TAIL_LAYER] = null
if(body_accessory)
if(body_accessory.animated_icon && body_accessory.animated_icon_state)
var/icon/accessory_s = new/icon("icon" = body_accessory.animated_icon, "icon_state" = body_accessory.animated_icon_state)
accessory_s.Blend(rgb(r_skin, g_skin, b_skin), body_accessory.blend_mode)
var/icon/accessory_s = new/icon("icon" = body_accessory.get_animated_icon(), "icon_state" = body_accessory.get_animated_icon_state())
accessory_s.Blend(rgb(r_skin, g_skin, b_skin), body_accessory.blend_mode)
overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.get_pixel_x(src), "pixel_y" = body_accessory.get_pixel_y(src))
overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.get_pixel_x(src), "pixel_y" = body_accessory.get_pixel_y(src))
else if(species.tail && species.bodyflags & HAS_TAIL)
var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]w_s")