From e27bc2c8efd015e3ccaf312cb3f7d29ea416125b Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Sat, 2 Mar 2024 22:18:07 +0300 Subject: [PATCH] [MIRROR] Don't use turf icons for abilities (#2215) * Don't use turf icons for abilities (#81720) ## About The Pull Request Fixes https://github.com/wall-nerds/wallening/issues/100 Replaces a couple of instances of abilities using the icons of walls or floors with different, somewhat more descriptive icons. I will be honest I do not understand why two of these were even using iron walls as an icon. Both of these instances were cases of "I want to surround something" so I have replaced them with this icon: ![image](https://github.com/tgstation/tgstation/assets/7483112/264da818-5c33-4093-b993-45ee1b06c24f) I have also replaced the "freeze floors" ability icon with the ice cube icon, rather than a 32x32 ice floor icon. ![image](https://github.com/tgstation/tgstation/assets/7483112/524af0ac-4128-4bd3-a3f0-f82583f6cbcb) I removed a bunch of old copies of goggles items from the `robot-items` dmi and made them just reference the corresponding item sprites that they were copies of, because they were out of date with the items and using deprecated sprites. X-Ray now just looks like the red sam fisher goggles instead of a caution sign (not that it is obtainable in game). Oh also I added a tooltip to Ice Demon afterimages because it didn't have one. ## Why It's Good For The Game The previous icons don't even look like anything. ## Changelog :cl: image: Bubblegum Hallucination Surround Charge, Wendigo Shockwave Scream, and Ice Demon Floor Freeze all have more appropriate action icons. qol: Adds a tooltip to Ice Demon Afterimages ability. image: Cyborg view items now use the same sprites as their corresponding goggles instead of old versions of those sprites. /:cl: * Don't use turf icons for abilities --------- Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com> Co-authored-by: Jacquerel --- code/datums/actions/mobs/charge.dm | 4 ++-- code/game/objects/items/robot/items/hud.dm | 4 ++-- .../icemoon/ice_demon/ice_demon_abilities.dm | 5 +++-- .../hostile/megafauna/wendigo.dm | 4 ++-- icons/mob/silicon/robot_items.dmi | Bin 2188 -> 1632 bytes 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm index 9b8e1c36ef8..1a3afba14d1 100644 --- a/code/datums/actions/mobs/charge.dm +++ b/code/datums/actions/mobs/charge.dm @@ -304,8 +304,8 @@ /datum/action/cooldown/mob_cooldown/charge/hallucination_charge/hallucination_surround name = "Surround Target" - button_icon = 'icons/turf/walls/wall.dmi' - button_icon_state = "wall-0" + button_icon = 'icons/mob/actions/actions_animal.dmi' + button_icon_state = "expand" desc = "Allows you to create hallucinations that charge around your target." charge_delay = 0.6 SECONDS charge_past = 2 diff --git a/code/game/objects/items/robot/items/hud.dm b/code/game/objects/items/robot/items/hud.dm index 6b11c71941b..7ee8a938625 100644 --- a/code/game/objects/items/robot/items/hud.dm +++ b/code/game/objects/items/robot/items/hud.dm @@ -1,10 +1,10 @@ /obj/item/borg/sight var/sight_mode = null + icon = 'icons/obj/clothing/glasses.dmi' /obj/item/borg/sight/xray name = "\proper X-ray vision" - icon = 'icons/obj/signs.dmi' - icon_state = "securearea" + icon_state = "securityhudnight" sight_mode = BORGXRAY /obj/item/borg/sight/thermal diff --git a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm index b143f471138..af17fc0cb01 100644 --- a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm +++ b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm @@ -34,8 +34,8 @@ /datum/action/cooldown/mob_cooldown/slippery_ice_floors name = "Iced Floors" desc = "Summon slippery ice floors all around!" - button_icon = 'icons/turf/floors/ice_turf.dmi' - button_icon_state = "ice_turf-6" + button_icon = 'icons/effects/freeze.dmi' + button_icon_state = "ice_cube" cooldown_time = 2 SECONDS click_to_activate = FALSE melee_cooldown_time = 0 SECONDS @@ -84,6 +84,7 @@ /datum/action/cooldown/spell/conjure/limit_summons/create_afterimages name = "Create After Images" + desc = "Creates two illusionary doubles to increase your firepower, but which share some of your life force." button_icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' button_icon_state = "ice_demon" spell_requirements = NONE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 342713ee960..6632dedd234 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -88,8 +88,8 @@ Difficulty: Hard /datum/action/innate/megafauna_attack/shockwave_scream name = "Shockwave Scream" - button_icon = 'icons/turf/walls/wall.dmi' - button_icon_state = "wall-0" + button_icon = 'icons/mob/actions/actions_animal.dmi' + button_icon_state = "expand" chosen_message = "You are now screeching, disorienting targets around you." chosen_attack_num = 3 diff --git a/icons/mob/silicon/robot_items.dmi b/icons/mob/silicon/robot_items.dmi index 9f8b0142e9c62a9828ad720a274660e4dcbe1a4d..e18a9d08f8691b2d67ee95e7b800d6c7426175eb 100644 GIT binary patch delta 1500 zcmV<21ta>55#S72iBL{Q4GJ0x0000DNk~Le0001>0001>2m=5B0K5^G9{>OV;ZRIe zMZmzo{{R4_001j1HOv42rKP2r005bpnSg+RWMpJ!W`J2)asU4S|Nk>6C@4BQI+3{~ z16Ed6k=-5xkdTm(`(1yyxB$Swz}eZ^>gwt(hSh5T0004WQchCV=-0C=3GlT8c4Fbsyz?XM_$74hrf#fvE7LI1*tZCuN`b!45xe{ZKS z@ME|sJv4dAlf0yKDAwEE{wOwwJ-;9o#${q97UKzLl~G=YWIli6Orwdlei%(Fq|5&LPi%z?a2uRMh$kuVmPis(`TX#CNWq zIsFHob%R4DlfHj;U!WddKagFGB3+E^u-T#59yj+7cLQ1d5jY%DR)qin1T9HKK~#90 z?U@T#+AtJ=Q^QJmXs5MGsTP&zP^NR@9=gqm+s^j?f6$Ubp_L{LB&Bh?pM}%IZIZ8f z6|M*Y0001S49(+Pn14;t@e+Q8QAyu8!e$xk97nipVN-wOIJv?yvCeUXD;0hP1;-I4 zXdSnzRf}^)(Q$-pM!m+XpjJ2d@qEi~W{z!3#OWN^5{NVF2;-aeFGWgk-dX67K>-qzkd5{#W5Se4V^ckmoDI9(F zB*=G_1X;*lyp%OwX(@HpTJHd`mBr=j7Ye|F}Fia8jr--GQ=>!jI^`}ux% zA*jZX+k;*Zcs#*or`HJu=Y9*p{t;1(v$i3-2fg633LkQ5vY25;!mZW6;bIq~Oy z{$XU;e{Pgz$cXcLkO+ESK#zpraBzM;q(^_7E|NAm@qGcoWh0>;cAZAUVG5EtNZy_a zUYw6c)1ytGCv&~GmsjF~g19bgBi#4s0Mm&W8qNg=7sFxli1glFzrRr}IHo-~P8X!3 zOQs+3q=t(*xFk6AuWvtm{B-^K?moUqlwi4z<67y02VS_(kf}(=I<|^iUzWN3di{Ux z{^7e~!N%C3tJoPg(gj1qup)?it7wA^w$~HfTn}%*&^ahk;nIm@ zecB7Eo`b3d*IXoQlnZJ<#4l8E{e4c8MZ&3Y=|m1#B+~VPplp4*&q3t~2+C~yr&gZ+ z9Ofm(3Q{uunFE3V0093Jx<2yf=r5@ILrH(Z-$ff_@JD+=?T5Gs!BxI6>MvNt99%`P zkVUeRp!P!yf+@fvkp&isEdQ3E?sKpZKu{L_1pfjItdMax5QujG0000 CP|AV; delta 2059 zcmV+m2=w>h42%(fiBL{Q4GJ0x0000DNk~Le0002M0001>2m=5B0B!b@ZvX%RK2S_l zMZmzo{{R30Y05df*|6D}B00jX5|0pOZgTDEG|6Bn70RMA3TmXoO0JF0I%>SIr`*pgwvL`&eZF0004WQchCV=- z0C=3Gl+S7cF%ZVjo2LkREv4EXdg-Mo#e=@WGA7eaFn^Xw;^NyI6$Gu@&9>w)nc@4* zd`uuy{<-{GZTMonVtb^Zz2hJJ?fHd&Rh^bm<>YnFDuudH@sflH5%YCoF?cs&mDCh+ zK4aB4K`x%}S5;I<7R;bdA(*ICl7mW{Bk6*c0YxGm4<${}pa8Oub?>=~1`en4)6HQO zVW*wEZ6*{@gH&H)-|SyeNzjc0y>lp{r{PVf#(J4dud%Drcw=hB1$}Fj)iTvX{SBF4OYYi|a^#r7~Ax9frD0U4<2hF(K&#arVRGAcDg&1ICF#0Hj>rJ9nJR=-k1KbcfM%_Rj|fpJR!00000 z0000cqTcnS$3^}3Nso*A?~@)E_TMKx&hNiV5a;&arHFHTk21tL{dY;??EbqHaYfy% zW?21qKhEyY$CuB4ZoG-|*{1~k zdFBbB@;M4{oF`E9{eYkeb^zvC}gv)0;=#S4lA?Uv|1qk}{L7XixT)tQz^8`Wv zJ!G6MFl7Fyabf@6k8_qdR6OeZ?6|o9KIw4)0000003b zTEhm8kB`5_kM%YQHCL;V|AirlXEGZqYajAf02ydB zTKF+!;NXTVr4+Qdm;(~k9=SU|JDFu;G}u+?uQ?Ly7>9(no`7x z-k-03=&s|qIyHo@Lf&;0l>**N16QGgUr65ldhy%!``<|eiQb=I?>hJ@vP6_6Ggs@bL2e`P)NM zzqtP%2?xFMb^PN94Gg`J`L8)X>N!9bX!1jU^xq@Vbrd8W{i2rf@W*L-r7Jfd{`hd~ z9sNm-CwzZ?*INU|WhflCJqI0nJmLO(7q37R{m8-X8Gi8@`X!;$ky}3i000000FXR) z;}#H=R1MrGFy>tngEC2AGKK-CN4&G$$M4|ouh@s=Om>ef3=+ebTca5mZH0*C7C8ui z;czR>8W0!U{i9bX_9DI`4icO!i7`_*5O)ovZD7PAW|O*sbhpqQCf@n}qXtHQCzhm$ zIRg?012HIKl9Y=$=E;&66AV0dzBFq<3gkD?XWU96Ahmdm^acO`003!_{w+s-1F3#L zkO1-