Skip to content

Commit

Permalink
Fixing inhand sprites for psi-abilities
Browse files Browse the repository at this point in the history
  • Loading branch information
VoiceInYourHead committed Jun 6, 2024
1 parent f861b34 commit a80f7fe
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 1 deletion.
30 changes: 30 additions & 0 deletions code/modules/psionics/equipment/psipower_blade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
sharp = TRUE
edge = TRUE
maintain_cost = 6

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "psiblade_short"
item_state = "psiblade_short"
attack_cooldown = 8
Expand All @@ -30,6 +36,12 @@
/obj/item/psychic_power/psiblade/master/grand
force = 35
maintain_cost = 4

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "psiblade_long"
item_state = "psiblade_long"

Expand Down Expand Up @@ -69,6 +81,12 @@
sharp = TRUE
edge = TRUE
maintain_cost = 8

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "psiaxe"
item_state = "psiaxe"
attack_cooldown = 16
Expand Down Expand Up @@ -99,6 +117,12 @@
force = 10
edge = TRUE
maintain_cost = 5

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "psiclub"
item_state = "psiclub"
attack_cooldown = 6
Expand Down Expand Up @@ -129,6 +153,12 @@
sharp = TRUE
edge = TRUE
maintain_cost = 6

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "psispear"
item_state = "psispear"
attack_cooldown = 12
Expand Down
6 changes: 6 additions & 0 deletions code/modules/psionics/equipment/psipower_cryokinesis.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
/obj/item/cryokinesis
name = "ice"
icon = 'icons/obj/psychic_powers.dmi'

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "cryo"

var/delete_on_drop = 0 //should we delete this item, if it isn't in our inventory?
Expand Down
20 changes: 19 additions & 1 deletion code/modules/psionics/equipment/psipower_orbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
force = 5
edge = TRUE
maintain_cost = 10

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "electro"
item_state = "electro"
attack_cooldown = 5
Expand Down Expand Up @@ -302,6 +308,12 @@
force = 5
edge = TRUE
maintain_cost = 10

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "pyro"
item_state = "pyro"
attack_cooldown = 5
Expand Down Expand Up @@ -494,7 +506,7 @@
layer = ABOVE_HUMAN_LAYER
w_class = ITEM_SIZE_NO_CONTAINER
health_max = 200
// icon = 'icons/fd/freeze.dmi'
icon = 'icons/psi_fd/freeze.dmi'
icon_state = "ice_cube"
var/timer = 30

Expand Down Expand Up @@ -561,6 +573,12 @@
force = 5
edge = TRUE
maintain_cost = 10

item_icons = list(
slot_l_hand_str = 'icons/psi_fd/lefthand.dmi',
slot_r_hand_str = 'icons/psi_fd/righthand.dmi',
)

icon_state = "cryo"
item_state = "cryo"
attack_cooldown = 5
Expand Down
Binary file added icons/psi_fd/freeze.dmi
Binary file not shown.
Binary file added icons/psi_fd/lefthand.dmi
Binary file not shown.
Binary file added icons/psi_fd/righthand.dmi
Binary file not shown.

0 comments on commit a80f7fe

Please sign in to comment.