[MIRROR] bunny taur sprite fix & misc fixes (#11218)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-07-22 01:35:19 -07:00
committed by GitHub
parent 2bc6485c7b
commit 232e5de984
7 changed files with 10 additions and 9 deletions

View File

@@ -104,6 +104,7 @@
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_storage_space = ITEMSIZE_COST_NORMAL * 25 max_storage_space = ITEMSIZE_COST_NORMAL * 25
max_w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL
allow_quick_empty = FALSE
can_hold = list(/obj/item/ore) can_hold = list(/obj/item/ore)
var/current_capacity = 0 var/current_capacity = 0
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry. var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.

View File

@@ -1332,9 +1332,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
if(tail_style.do_colouration) if(tail_style.do_colouration)
tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode)
if(tail_style.extra_overlay) if(tail_style.extra_overlay)
var/icon/overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay) var/icon/overlay = new/icon("icon" = (tail_style.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay)
if(wagging && tail_style.ani_state) if(wagging && tail_style.ani_state)
overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay_w) overlay = new/icon("icon" = (tail_style.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay_w)
overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode)
tail_s.Blend(overlay, ICON_OVERLAY) tail_s.Blend(overlay, ICON_OVERLAY)
qdel(overlay) qdel(overlay)
@@ -1344,9 +1344,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
qdel(overlay) qdel(overlay)
if(tail_style.extra_overlay2) if(tail_style.extra_overlay2)
var/icon/overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2) var/icon/overlay = new/icon("icon" = (tail_style.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2)
if(wagging && tail_style.ani_state) if(wagging && tail_style.ani_state)
overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2_w) overlay = new/icon("icon" = (tail_style.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2_w)
overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode)
tail_s.Blend(overlay, ICON_OVERLAY) tail_s.Blend(overlay, ICON_OVERLAY)
qdel(overlay) qdel(overlay)

View File

@@ -28,7 +28,9 @@
var/mob_offset_x = 0 var/mob_offset_x = 0
var/mob_offset_y = 0 var/mob_offset_y = 0
// Taur Loafing // Taur Loafing - IMPORTANT, READ BELOW.
///IF SET TO TRUE, THE icon_state, extra_overlay, and extra_overlay2 MUST BE IN WHATEVER YOU SET icon_loaf to!
///ADDITIONALLY, IF YOU ADD A SPECIAL VWAG, YOU NEED TO INCLUDE ani_state, extra_overlay_w, and extra_overlay2_w INTO icon_loaf TOO!
var/can_loaf = FALSE var/can_loaf = FALSE
var/loaf_offset = 0 var/loaf_offset = 0
var/list/lower_layer_dirs = list(SOUTH, WEST, EAST) var/list/lower_layer_dirs = list(SOUTH, WEST, EAST)

View File

@@ -608,7 +608,6 @@
extra_overlay2 = "feline_markings_2" extra_overlay2 = "feline_markings_2"
//icon_sprite_tag = "feline2c" //icon_sprite_tag = "feline2c"
can_loaf = TRUE can_loaf = TRUE
icon_loaf = 'icons/mob/vore/taurs_loaf.dmi'
/datum/sprite_accessory/tail/taur/feline/fatfeline_2c /datum/sprite_accessory/tail/taur/feline/fatfeline_2c
name = "Fat Feline 3-color (Taur)" name = "Fat Feline 3-color (Taur)"
@@ -616,7 +615,6 @@
extra_overlay = "fatfeline2_markings" extra_overlay = "fatfeline2_markings"
extra_overlay2 = "fatfeline2_markings_2" extra_overlay2 = "fatfeline2_markings_2"
can_loaf = TRUE can_loaf = TRUE
icon_loaf = 'icons/mob/vore/taurs_loaf.dmi'
loaf_offset = 3 loaf_offset = 3
/datum/sprite_accessory/tail/taur/feline/feline_2c_wag /datum/sprite_accessory/tail/taur/feline/feline_2c_wag
@@ -625,8 +623,8 @@
extra_overlay = "feline2_markings" extra_overlay = "feline2_markings"
extra_overlay2 = "feline2_markings_2" extra_overlay2 = "feline2_markings_2"
ani_state = "fatfeline_s" ani_state = "fatfeline_s"
extra_overlay_w = "fatfeline_markings" extra_overlay_w = "fatfeline_markings_vwag"
extra_overlay2_w = "fatfeline_markings_2" extra_overlay2_w = "fatfeline_markings_vwag2"
loaf_offset = 3 loaf_offset = 3
/datum/sprite_accessory/tail/taur/feline/synthfeline /datum/sprite_accessory/tail/taur/feline/synthfeline

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 364 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB