Skip to content

Commit

Permalink
[MIRROR] Don't use turf icons for abilities (#2215)
Browse files Browse the repository at this point in the history
* Don't use turf icons for abilities (#81720)

## About The Pull Request

Fixes wall-nerds/wallening#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 <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
  • Loading branch information
3 people authored Mar 2, 2024
1 parent ccacf9d commit e27bc2c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions code/datums/actions/mobs/charge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/robot/items/hud.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<span class='colossus'>You are now screeching, disorienting targets around you.</span>"
chosen_attack_num = 3

Expand Down
Binary file modified icons/mob/silicon/robot_items.dmi
Binary file not shown.

0 comments on commit e27bc2c

Please sign in to comment.