From c623617f63a0847542abff894bc359cb3b3a476a Mon Sep 17 00:00:00 2001 From: DigitalSquirrel95 <48812209+DigitalSquirrel95@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:30:47 -0400 Subject: [PATCH] Ports new Rogue Star tails (#16230) Ports the Big Squirrel, Flagtail, and Bunnytaur tail options from Rogue Star --- ATTRIBUTIONS.md | 7 +++++++ .../mob/living/carbon/human/update_icons.dm | 4 ++-- .../new_player/sprite_accessories_tail_vr.dm | 18 +++++++++++++++++ .../new_player/sprite_accessories_taur_vr.dm | 19 ++++++++++++++++++ icons/rogue-star/loafs_64x32.dmi | Bin 0 -> 1384 bytes icons/rogue-star/tails_64x32_rs.dmi | Bin 0 -> 4639 bytes 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 icons/rogue-star/loafs_64x32.dmi create mode 100644 icons/rogue-star/tails_64x32_rs.dmi diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index 60f2305a8c3..3e5639a5217 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -73,3 +73,10 @@ **Creator:** Poojawa (https://github.com/VOREStation/VOREStation/pull/6052)
**License:** [General License](sound/vore/sunesound/LICENSE.txt)
**Notes:** Permission to use assets also given in writing. All files under this folder is NOT licensed under CC3. Seek separate permission before copying/using.
+
+**File:** `icons/rogue-star/loafs_64x32.dmi`and `icons/rogue-star/tails_64x32_rs.dmi`
+**Title:** Rogue Star Tails
+**Icon-States:** `flagtail`, derivs by VerySoft, `bnytr`, derivs by Verysoft, `chonksqrl`, derivs by Verysoft
+**Creator:** VerySoft (https://github.com/TS-Rogue-Star/Rogue-Star/pull/435)
+**URL:** [Website](https://rogue-star.net/)
+**License:** Permission granting in writing for use by Virgo and Chomp with proper attribution diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index c27553b787b..ae5008e27e6 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1356,7 +1356,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() 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) //CHOMPEdit if(wagging && tail_style.ani_state) - overlay = new/icon("icon" = 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) //RS EDIT overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) tail_s.Blend(overlay, ICON_OVERLAY) qdel(overlay) @@ -1368,7 +1368,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() 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) //CHOMPEdit if(wagging && tail_style.ani_state) - overlay = new/icon("icon" = 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) //RS EDIT overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) tail_s.Blend(overlay, ICON_OVERLAY) qdel(overlay) diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index 963eed182ab..e38e7a501db 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -1532,3 +1532,21 @@ extra_overlay2 = "kaiju_long_a_spikes_glow" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + +//RS ADD START + +/datum/sprite_accessory/tail/longtail/flagtail + name = "Flagtail" + icon = 'icons/rogue-star/tails_64x32_rs.dmi' + icon_state = "flagtail" + extra_overlay = "flagtail-1" + extra_overlay2 = "flagtail-2" + +/datum/sprite_accessory/tail/longtail/chonksqrl + name = "Squirrel (Big)" + icon = 'icons/rogue-star/tails_64x32_rs.dmi' + icon_state = "chonksqrl" + extra_overlay = "chonksqrl-m1" + extra_overlay2 = "chonksqrl-m2" + +//RS ADD END \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 44064c6a0d8..0d9e9a1539f 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -1119,3 +1119,22 @@ offset_y = -11 mob_offset_y = 11 */ + +//RS ADD START + + +/datum/sprite_accessory/tail/taur/bunny + name = "Bunny (Taur, Fat vwag)" + icon = 'icons/rogue-star/tails_64x32_rs.dmi' + icon_state = "bnytr" + extra_overlay = "bnytr-m1" + extra_overlay2 = "bnytr-m2" + ani_state = "bnytr-f" + extra_overlay_w = "bnytr-m1" + extra_overlay2_w = "bnytr-f-m2" + + can_loaf = TRUE + icon_loaf = 'icons/rogue-star/loafs_64x32.dmi' + loaf_offset = 4 + +//RS ADD END \ No newline at end of file diff --git a/icons/rogue-star/loafs_64x32.dmi b/icons/rogue-star/loafs_64x32.dmi new file mode 100644 index 0000000000000000000000000000000000000000..23ee14519446d0f36b432aa82189644922d9404d GIT binary patch literal 1384 zcmXw3dor}4+h^O`BPRVB?9lJ@etfU^s7)6@?KxVHb_#SFbn<1I zMIeRaoTr>11j)vxN>u8Tp6O&&%`+)gqrln`W&HG@7pbfu+NaVJX<=M$SOLA2)2$<< z+fiD;fN3#ax6Z=V1^_e(crTA2+MW5ku_+Y@y=xzX>jq!NDYv%PvWsE^Fnd7c1li*% zL0pqIUQ=a&h}@~xt`7Ph-+_<;8j?#u`3_t%Vg~U(9PNrpE383x5xB~W`{k# z>`u;r)`_E{YpMy?PerdaLLTM)n9sq~w$hg=QyDR5lq5G|iRv{(DOkC*N;#)(rhl8A z<r^aJH&r3pPfRx3B&HBp)2Q~aBFxw`i>>~*1b&)58R}gY}Dd$RN zK+uD(t9CCy7zu+4hr<_~uQ){e3>}8G)pr;^ODeL8ZlDcz>ZT5ryHLjWB9yTvpxNHn zqC=7%e65|cnJhGkIf_rDVw3xp-}Tk`iBxkSe@zB8CKIFl+)=r!(>on;2#Ws1DIX2^ zsm7z;>Sx9>gD)S{O?$bn$`iP(H%%yA>}7`=KZP>P1**8gY|E?CHo_-|W58QRP6 z^jY01lQzG);Z)C?54etAqdpoFq>;3_;F~FNj%jnRSR-g<=r2zu&80EnlPxvR{fVyZ zlKYFITZZRPu8I~+bMww79_DHq+pOLsDEkpWmNp()a6ldYS!^l6cxq z2U;&jY@hl&WU?^=(%Gjvc8^)U#oOK{ZIyR;ur}Y;v`DN zrcketJpA^?erTNgH!pxqGPJor>^A&@H%1ivy+z8ob`y$1n&^>TM}SoNk1FCaP+bpx zZ%nzj0=B9ZP&Lt5V)&`*RZg4pv}^~hIw`8I(_b%S0mR{VI6v9Y>V=tFwLH6^`E{-3 z*1mRO1yACT-NJq-n1MMLujtypDcJ<7iJW}%#+pbK%SX;0Vm#J;6MvjhlyjF%dnYEW zK`doE=tYg2xJWvpecl<@N@;|j5*M5%7D4P4?skH|2?X@>h4#BO_ zEw~^9f!Mv}n?^tztq^(Vc7GqSkPgu4VEtt li6w$^)i!*$!2;0Q4A8-0OHQKU!-DhMh~6zK`Q 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 literal 0 HcmV?d00001