cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-15-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-15 19:34:41 -04:00
parent 00716094d8 7007a304d3
commit d14e538393
656 changed files with 24772 additions and 15866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/pets/dog/corgi.dm
+1 -1
View File
@@ -292,7 +292,7 @@
possible_headwear += item
if(!length(possible_headwear))
for(var/obj/item/item in orange(1))
if(ispath(item.dog_fashion, /datum/dog_fashion/head) && CanReach(item))
if(ispath(item.dog_fashion, /datum/dog_fashion/head) && item.IsReachableBy(src))
possible_headwear += item
if(!length(possible_headwear))
return
code/modules/mob/living/basic/pets/pet_designer.dm
+1 -1
View File
@@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(pet_options, list(
for(var/color in possible_colors)
demo_carrier.set_greyscale(possible_colors[color])
list_to_return[color] = icon2base64(getFlatIcon(demo_carrier))
list_to_return[color] = icon2base64(getFlatIcon(demo_carrier, no_anim = TRUE))
qdel(demo_carrier)
return list_to_return