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

resprites rayne corp. lantern and adds it to loadout store #4504

Merged
merged 1 commit into from
Dec 8, 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
Binary file modified icons/mob/inhands/equipment/mining_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/mining_righthand.dmi
Binary file not shown.
10 changes: 4 additions & 6 deletions monkestation/code/game/objects/items/rayne_corp/rayne_lantern.dm
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
/obj/item/flashlight/lantern/rayne
name = "lantern"
icon_state = "lantern"
inhand_icon_state = "lantern"
icon = 'monkestation/icons/obj/rayne_corp/rayne.dmi'
icon_state = "rayne_lantern"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
desc = "A lantern that hangs off the shoulder providing some warmth and lighting with an incandescent heat lamp. \
This is an old piece of technology, usefull for exploring cold planetoids or the void of space. \
It is stamped with a Rayne Corp logo on the bottom."
light_outer_range = 5// luminosity when on
light_system = OVERLAY_LIGHT
icon = 'monkestation/icons/obj/rayne_corp/rayne.dmi'
icon_state = "rayne_lantern"
inhand_icon_state = "lantern" // todo
inhand_icon_state = "rayne_lantern"
worn_icon = 'monkestation/icons/obj/rayne_corp/rayne.dmi'
worn_icon_state = "rayne_lantern_worn"
slot_flags = ITEM_SLOT_NECK
slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_BELT

/obj/item/flashlight/lantern/rayne/process(seconds_per_tick)

Expand Down
5 changes: 5 additions & 0 deletions monkestation/code/modules/store/store_items/belts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ GLOBAL_LIST_INIT(store_belts, generate_store_items(/datum/store_item/belts))
name = "Lantern"
item_path = /obj/item/flashlight/lantern

/datum/store_item/belts/rayne_lantern
name = "Heater Lantern"
item_path = /obj/item/flashlight/lantern/rayne
item_cost = 3500

/datum/store_item/belts/candle_box
name = "Candle Box"
item_path = /obj/item/storage/fancy/candle_box
Expand Down
Binary file modified monkestation/icons/obj/rayne_corp/rayne.dmi
Binary file not shown.
Loading