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

Adds Donator Fluff Items to Loadout #1443

Open
wants to merge 4 commits into
base: main
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
3 changes: 3 additions & 0 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1548,6 +1548,9 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr
var/list/loadouts_available = list("None")
for (var/path as anything in GLOB.loadout_items)
var/datum/loadout_item/loadout = GLOB.loadout_items[path]
var/donoritem = loadout.donoritem
if(donoritem && !loadout.donator_ckey_check(user.ckey))
continue
if (!loadout.name)
continue
loadouts_available[loadout.name] = loadout
Expand Down
20 changes: 20 additions & 0 deletions modular_azurepeak/code/datums/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,18 @@ GLOBAL_LIST_EMPTY(loadout_items)
var/name = "Parent loadout datum"
var/desc
var/path
var/donoritem //autoset on new if null
var/list/ckeywhitelist

/datum/loadout_item/New()
if(isnull(donoritem))
if(ckeywhitelist)
donoritem = TRUE

/datum/loadout_item/proc/donator_ckey_check(key)
if(ckeywhitelist && ckeywhitelist.Find(key))
return TRUE
return

//HATS
/datum/loadout_item/shalal
Expand Down Expand Up @@ -224,3 +235,12 @@ GLOBAL_LIST_EMPTY(loadout_items)
/datum/loadout_item/bell_collar
name = "Bell Collar"
path = /obj/item/clothing/neck/roguetown/collar/bell_collar

//Donator Section
//All these items are stored in the donator_fluff.dm in the azure modular folder for simplicity.
//All should be subtypes of existing weapons/clothes/armor/gear, whatever, to avoid balance issues I guess. Idk, I'm not your boss.

/datum/loadout_item/donator_plex
name = "Rapier di Aliseo"
path = /obj/item/rogueweapon/sword/rapier/aliseo
ckeywhitelist = list("plexiant")
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//Lazily shoving all donator fluff items in here for now. Feel free to make this a sub-folder or something, I think it's just easier to keep a list here and just modify as needed.
/obj/item/rogueweapon/sword/rapier/aliseo
name = "Rapier di Aliseo"
desc = "A rapier of sporting a steel blade and decrotive silver-plating. Elaborately designed in classic intricate yet functional Etrucian style, the pummel appears to be embedded with a cut emerald with a family crest engraved in the fine leather grip of the handle."
icon_state = "plex"
icon = 'modular_azurepeak/icons/obj/items/donar_weapons_64.dmi'
Binary file not shown.
1 change: 1 addition & 0 deletions roguetown.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1982,6 +1982,7 @@
#include "modular_azurepeak\code\game\area\areas.dm"
#include "modular_azurepeak\code\game\objects\effects\temporary_visuals\miracles.dm"
#include "modular_azurepeak\code\game\objects\effects\temporary_visuals\music.dm"
#include "modular_azurepeak\code\game\objects\items\donator_fluff_items.dm"
#include "modular_azurepeak\code\game\objects\items\gwstrap.dm"
#include "modular_azurepeak\code\game\objects\items\mundanities.dm"
#include "modular_azurepeak\code\game\objects\items\quicksilver.dm"
Expand Down