Skip to content

Commit

Permalink
[MIRROR] Unique icons for lock path spells (#2286)
Browse files Browse the repository at this point in the history
* Unique icons for lock path spells (#81832)

## About The Pull Request

Adds unique icons for several lock path spells: caretaker's refuge,
apetra vulnera and ascended shapeshift.


https://github.com/tgstation/tgstation/assets/44502667/8fe907bc-4da9-4007-97f2-445b26be3068

Never added sprites before, so I hope nothing breaks. Also for some
reason visual studio code really wanted to change some indentation on
some empty lines in apetravulnera.dm, so there's some random changes,
had no idea how to prevent it, and it doesn't seem to actually matter.
## Why It's Good For The Game

These spells used to (except for ascended shapeshift) use icons that
other heretic spells also used, potentially leading to confusion. Also
it's nice to have unique icons for each spell.
## Changelog
:cl:
image: added unique icons for spells: caretaker's refuge, apetra vulnera
and ascended shapechange
/:cl:

* Unique icons for lock path spells

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: ViktorKoL <[email protected]>
  • Loading branch information
3 people authored Mar 7, 2024
1 parent 3fe8dfd commit ebd5bba
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions code/modules/antagonists/heretic/magic/apetravulnera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
background_icon_state = "bg_heretic"
overlay_icon_state = "bg_heretic_border"
button_icon = 'icons/mob/actions/actions_ecult.dmi'
button_icon_state = "cleave"
button_icon_state = "apetra_vulnera"

school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
Expand All @@ -23,7 +23,7 @@

/datum/action/cooldown/spell/pointed/apetra_vulnera/cast(mob/living/carbon/human/cast_on)
. = ..()

if(IS_HERETIC_OR_MONSTER(cast_on))
return FALSE

Expand All @@ -44,7 +44,7 @@
a_limb_got_damaged = TRUE
var/datum/wound/slash/crit_wound = new wound_type()
crit_wound.apply_wound(bodypart)

if(!a_limb_got_damaged)
var/datum/wound/slash/crit_wound = new wound_type()
crit_wound.apply_wound(pick(cast_on.bodyparts))
Expand All @@ -53,7 +53,7 @@
span_danger("[cast_on]'s scratches and bruises are torn open by an unholy force!"),
span_danger("Your scratches and bruises are torn open by some horrible unholy force!")
)

new /obj/effect/temp_visual/cleave(get_turf(cast_on))

return TRUE
2 changes: 2 additions & 0 deletions code/modules/antagonists/heretic/magic/ascended_shapeshift.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
cooldown_time = 20 SECONDS
convert_damage = FALSE
die_with_shapeshifted_form = FALSE
button_icon = 'icons/mob/actions/actions_ecult.dmi'
button_icon_state = "lock_ascension"
possible_shapes = list(
/mob/living/basic/heretic_summon/ash_spirit,
/mob/living/basic/heretic_summon/raw_prophet/ascended,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/heretic/magic/caretaker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
and you can be removed from it upon contact with antimagical artifacts."
background_icon_state = "bg_heretic"
overlay_icon_state = "bg_heretic_border"
button_icon = 'icons/mob/actions/actions_minor_antag.dmi'
button_icon_state = "ninja_cloak"
button_icon = 'icons/mob/actions/actions_ecult.dmi'
button_icon_state = "caretaker"
sound = 'sound/effects/curse2.ogg'

school = SCHOOL_FORBIDDEN
Expand Down
Binary file modified icons/mob/actions/actions_ecult.dmi
Binary file not shown.

0 comments on commit ebd5bba

Please sign in to comment.