Skip to content

Commit

Permalink
8.3 Another fixes & sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
NightDawnFox committed Nov 14, 2024
1 parent c3d3724 commit 28099ab
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/game/objects/items/weapons/fishing_rod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
name = "ol' reliable"
desc = "О! Кажется, я поймал шахтера!"
icon = 'icons/obj/lavaland/lava_fishing.dmi'
lefthand_file = 'icons/mob/inhands/lavaland/lava_items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/lavaland/lava_items_righthand.dmi'
icon_state = "fishing_rod"
item_state = "fishing_rod"
w_class = WEIGHT_CLASS_BULKY
Expand All @@ -22,6 +24,12 @@
/// Actual fish that we catch
var/reward_fish = null

/obj/item/twohanded/fishing_rod/tribal
name = "fishing rod"
desc = "Примитивная костяная удочка, использующая сухожилия наблюдателя в качестве высокопрочной лески. Не совсем понятно, почему эта \"леска\" не плавится в лаве."
icon_state = "tribal_rod"
item_state = "fishing_rod"

/obj/item/twohanded/fishing_rod/Destroy()
. = ..()
QDEL_NULL(bait)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/mining/ash_walkers/bait.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
desc = "Тестовая наживка, если вы это видите, пингуйте зюзю."
icon = 'icons/obj/lavaland/lava_fishing.dmi'
icon_state = "ash_eater"
lefthand_file = 'icons/mob/inhands/lavaland/bait_lefthand.dmi'
righthand_file = 'icons/mob/inhands/lavaland/bait_righthand.dmi'
item_state = "ash_eater"
list_reagents = list("protein" = 1) //mmmm tasty
tastes = list("ash" = 5, "hopelessness" = 1)
bitesize = 1
Expand Down Expand Up @@ -48,6 +51,7 @@
)
desc = "Паразитическая форма жизни Лазис Ардакса, которая цепляется к оголённым участкам кожи и питается своими жертвами. Её брюшко краснеет от количества выпитой ею крови."
icon_state = "bloody_leach"
item_state = "bloody_leach"
rod_overlay = "bloody_leach_rod"

/obj/item/reagent_containers/food/snacks/bait/goldgrub_larva
Expand All @@ -62,6 +66,7 @@
)
desc = "Небольшой червячок, который питается минералами, закопанными в пепле. Он так же пуглив, как и его более старшие сородичи."
icon_state = "goldgrub_larva"
item_state = "goldgrub_larva"
rod_overlay = "goldgrub_larva_rod"

/obj/item/reagent_containers/food/snacks/charred_krill
Expand All @@ -77,6 +82,7 @@
desc = "Одна из самых редких обиталей Лазис Ардакса, множество лет признанная вымершей. Эта креветка - одно из самых любимых угощений для местной \"подводной\" фауны."
icon = 'icons/obj/lavaland/lava_fishing.dmi'
icon_state = "charred_krill"
item_state = "charred_krill"
list_reagents = list("protein" = 1)
bitesize = 1
tastes = list("ash" = 5, "wasted opportunity" = 1)
Expand Down
Binary file added icons/mob/inhands/lavaland/bait_lefthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/lavaland/bait_righthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/lavaland/lava_items_lefthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/lavaland/lava_items_righthand.dmi
Binary file not shown.

0 comments on commit 28099ab

Please sign in to comment.