diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index fdc13d4185b..dfd410a168f 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -387,3 +387,24 @@ /obj/item/flashlight/lantern/on on = TRUE + +/obj/item/flashlight/lantern/voidtamer + name = "voidic lantern" + desc = "A strange lantern mounted on a metallic stick, draped in carphide. When activated, it ignites a gaseous system resembling a nebula." + icon = 'icons/obj/diona_items.dmi' + icon_state = "voidtamer_lantern" + item_state = "voidtamer_lantern" + flashlight_power = 2 //strong enough to sustain a dionae + light_range = 5 + light_color = LIGHT_COLOR_BLUE + efficiency_modifier = 1.5 + +/obj/item/flashlight/lantern/voidtamer/update_icon() + ..() + if(on) + item_state = "voidtamer_lantern-on" + else + item_state = "voidtamer_lantern" + +/obj/item/flashlight/lantern/voidtamer/on + on = TRUE diff --git a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm index 8f5ffa15c57..ad718e77349 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm @@ -202,6 +202,16 @@ ABSTRACT_TYPE(/datum/gear/suit/diona) flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION culture_restriction = list(/singleton/origin_item/culture/diona_voidtamer) +/datum/gear/voidtamer_lantern + display_name = "voidic lantern" + description = "A strange lantern mounted on a metallic stick, draped in carphide. When activated, it ignites a gaseous system resembling a nebula." + path = /obj/item/flashlight/lantern/voidtamer + cost = 3 //This is capable of sustaining dionae so should be a little more expensive + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + culture_restriction = list(/singleton/origin_item/culture/diona_voidtamer) + //skrell shared things /datum/gear/accessory/capes/diona diff --git a/html/changelogs/voidtamer_lantern.yml b/html/changelogs/voidtamer_lantern.yml new file mode 100644 index 00000000000..0c6e83259c5 --- /dev/null +++ b/html/changelogs/voidtamer_lantern.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Yonnimer + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a new voidtamer lantern to the voidtamer ship and as a loadout option." diff --git a/icons/obj/diona_items.dmi b/icons/obj/diona_items.dmi index 013b0b42cd5..1eb9fe5f4a0 100644 Binary files a/icons/obj/diona_items.dmi and b/icons/obj/diona_items.dmi differ diff --git a/maps/away/ships/voidtamer/trader/voidtamer_trader_ghostroles.dm b/maps/away/ships/voidtamer/trader/voidtamer_trader_ghostroles.dm index e92ba66e97c..09629b5814b 100644 --- a/maps/away/ships/voidtamer/trader/voidtamer_trader_ghostroles.dm +++ b/maps/away/ships/voidtamer/trader/voidtamer_trader_ghostroles.dm @@ -25,6 +25,7 @@ id = /obj/item/card/id/voidtamer l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/flashlight/survival = 1) + belt = /obj/item/flashlight/lantern/voidtamer /obj/outfit/admin/voidtamer_crew/get_id_access() return list(ACCESS_VOIDTAMER_SHIP, ACCESS_EXTERNAL_AIRLOCKS) @@ -50,6 +51,7 @@ id = /obj/item/card/id/voidtamer l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/flashlight/survival = 1) + belt = /obj/item/flashlight/lantern/voidtamer //items /obj/item/card/id/voidtamer