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

Patreon Custom Item Update: Befreier #1736

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
7 changes: 6 additions & 1 deletion code/modules/client/preference_setup/loadout/lists/custom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,9 @@
/datum/gear/custom/sfox63
display_name = "Kiras Treasured Synthesizer"
path = /obj/item/device/synthesized_instrument/synthesizer/kira
ckey = "sfox63"
ckey = "sfox63"

/datum/gear/custom/Gman222
display_name = "Boemus' Befreier"
path = /obj/item/gun/projectile/avasarala/befreier
ckey = "Gman222"
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
O.item_state = item_state
qdel(src)

return ..()
return ..()
31 changes: 30 additions & 1 deletion zzz_modular_eclipse/code/modules/custom_items/itemlist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,33 @@
/obj/item/device/synthesized_instrument/synthesizer/kira
name = "Kira\'s Treasured Synthesizer"
desc = "This Synthesizer is the only thing that Kira has left of her old life. It is her most precious posession."
spawn_blacklisted = TRUE
spawn_blacklisted = TRUE

/obj/item/gun/projectile/avasarala/befreier
name = "NL HG .40 Magnum Befreier"
desc = "A heavy caliber pistol, the Befreier seems to have been carefully and thoughtfully assembled using the well worn but expertly maintained bits of several other weapons, including rare parts salvaged from otherwise junked weapons. \
Firing magnum rounds from a box magazine, this weapon was crafted with the vessels many enemies in mind. \
The emblem of a compass star above a half cog has been carefully stenciled near the magazine well."
icon = 'zzz_modular_eclipse/icons/custom_items/nev_ghun.dmi'
icon_state = "befreier"
item_state = "befreier"
price_tag = 3000



/obj/item/gun/projectile/avasarala/befreier/update_icon()
if(wielded_item_state)
if(icon_contained)//If it has it own icon file then we want to pull from that.
if(wielded)
item_state_slots[slot_l_hand_str] = "lefthand" + wielded_item_state
item_state_slots[slot_r_hand_str] = "righthand" + wielded_item_state
else
item_state_slots[slot_l_hand_str] = "lefthand"
item_state_slots[slot_r_hand_str] = "righthand"
else//Otherwise we can just pull from the generic left and right hand icons.
if(wielded)
item_state_slots[slot_l_hand_str] = wielded_item_state
item_state_slots[slot_r_hand_str] = wielded_item_state
else
item_state_slots[slot_l_hand_str] = initial(item_state)
item_state_slots[slot_r_hand_str] = initial(item_state)
Binary file added zzz_modular_eclipse/icons/custom_items/nev_ghun.dmi
Binary file not shown.