Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Don't use turf icons for abilities #2215

Merged
merged 1 commit into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
Loading