diff --git a/code/datums/sleep_adv/sleep_adv.dm b/code/datums/sleep_adv/sleep_adv.dm index f3766aa85fb..5b6b8ba0ccc 100644 --- a/code/datums/sleep_adv/sleep_adv.dm +++ b/code/datums/sleep_adv/sleep_adv.dm @@ -133,9 +133,37 @@ /datum/sleep_adv/proc/show_ui(mob/living/user) var/list/dat = list() - dat += "
Cycle \Roman[sleep_adv_cycle]
" + SSassets.transport.send_assets(user.client, list("try4_border.png", "try4.png", "slop_menustyle2.css", "gragstar.gif")) + dat += {" + + + + + + + + + + "} + dat += "" + dat += "
Cycle \Roman[sleep_adv_cycle]
" + dat += "
" dat += "
Dream, for those who dream may reach higher heights

" dat += "
\Roman[sleep_adv_points]
" + dat += "
" for(var/skill_type in SSskills.all_skills) var/datum/skill/skill = GetSkillRef(skill_type) if(!enough_sleep_xp_to_advance(skill_type, 1)) @@ -143,13 +171,19 @@ var/can_buy = can_buy_skill(skill_type) var/next_level = get_next_level_for_skill(skill_type) var/level_name = SSskills.level_names[next_level] - dat += "
[skill.name] ([level_name]) - \Roman[get_skill_cost(skill_type)]" + dat += "
[skill.name] ([level_name])>\Roman[get_skill_cost(skill_type)]
" dat += "
" if(rolled_specials > 0) var/can_buy = can_buy_special() - dat += "
Dream something special - \Roman[get_special_cost()]" + dat += "
>Dream something special>\Roman[get_special_cost()]
" + dat += "
Dream something special - \Roman[get_special_cost()]" dat += "
Specials can have negative or positive effects" - dat += "

Your points will be retained
Continue
" + dat += "
" + dat += "

Your points will be retained
Continue
" + dat += {" + + + "} var/datum/browser/popup = new(user, "dreams", "
Dreams
", 350, 450) popup.set_window_options("can_close=0") popup.set_content(dat.Join()) diff --git a/code/modules/roguetown/roguemachine/steward.dm b/code/modules/roguetown/roguemachine/steward.dm index 96268f16a32..62668aff998 100644 --- a/code/modules/roguetown/roguemachine/steward.dm +++ b/code/modules/roguetown/roguemachine/steward.dm @@ -235,48 +235,58 @@ if(.) return if(locked) - to_chat(user, span_warning("It's locked. Of course.")) + to_chat(user, "It's locked. Of course.") return user.changeNext_move(CLICK_CD_MELEE) playsound(loc, 'sound/misc/keyboard_enter.ogg', 100, FALSE, -1) var/canread = user.can_read(src, TRUE) + SSassets.transport.send_assets(user?.client, list("try4_border.png", "try5.png", "slop_menustyle2.css")) var/contents + contents += {" + + + + + + + + + "} + switch(current_tab) if(TAB_MAIN) - contents += "
NERVE MASTER
" + contents += "
MASTER OF NERVES
" contents += "--------------
" - contents += "\[Bank\]
" - contents += "\[Stockpile\]
" - contents += "\[Import\]
" - contents += "\[Bounties\]
" - contents += "\[Log\]
" + contents += "\[Bank\]
" + contents += "\[Stockpile\]
" + contents += "\[Import\]
" + contents += "\[Bounties\]
" + contents += "\[Log\]
" contents += "
" if(TAB_BANK) - contents += "\[Return\]" - contents += " \[Compact: [compact? "ENABLED" : "DISABLED"]\]
" + contents += "\[Return\]
" contents += "
Bank
" contents += "--------------
" - contents += "Treasury: [SStreasury.treasury_value]m
" - contents += "\[Withdraw\]

" - contents += "\[Pay by Class\]

" - if(compact) - for(var/mob/living/carbon/human/A in SStreasury.bank_accounts) - if(ishuman(A)) - var/mob/living/carbon/human/tmp = A - contents += "[tmp.real_name] ([tmp.advjob ? tmp.advjob : tmp.job]) - [SStreasury.bank_accounts[A]]m" - else - contents += "[A.real_name] - [SStreasury.bank_accounts[A]]m" - contents += " / \[PAY\] \[FINE\]

" - else - for(var/mob/living/carbon/human/A in SStreasury.bank_accounts) - if(ishuman(A)) - var/mob/living/carbon/human/tmp = A - contents += "[tmp.real_name] ([tmp.advjob ? tmp.advjob : tmp.job]) - [SStreasury.bank_accounts[A]]m
" - else - contents += "[A.real_name] - [SStreasury.bank_accounts[A]]m
" - contents += "\[Give Money\] \[Fine Account\]

" + contents += "Treasury: [SStreasury.treasury_value]m

" + contents += "\[Pay by Class\]

" + for(var/mob/living/A in SStreasury.bank_accounts) + contents += "[A.real_name] - [SStreasury.bank_accounts[A]]m
" + contents += "\[Give Money\] \[Fine Account\]

" if(TAB_STOCK) - contents += "\[Return\]" + contents += "\[Return\]
" contents += " \[Compact: [compact? "ENABLED" : "DISABLED"]\]
" contents += "
Stockpile
" contents += "--------------
" @@ -287,10 +297,11 @@ for(var/datum/roguestock/stockpile/A in SStreasury.stockpile_datums) contents += "[A.name]:" contents += " [A.held_items[1] + A.held_items[2]]" - contents += " | SELL: [A.payout_price]m" - contents += " / BUY: [A.withdraw_price]m" + contents += " | SELL: [A.payout_price]
" + contents += " / BUY: [A.withdraw_price]
" if(A.importexport_amt) - contents += " \[IMP [A.importexport_amt] ([A.get_import_price()])\] \[EXP [A.importexport_amt] ([A.get_export_price()])\]
" + contents += "\[IMP [A.importexport_amt] ([A.get_import_price()])\] \[EXP [A.importexport_amt] ([A.get_export_price()])\]
" + contents += "\[[A.withdraw_disabled ? "Enable" : "Disable"] Withdrawing\]

" else contents += "Treasury: [SStreasury.treasury_value]m
" contents += "Lord's Tax: [SStreasury.tax_value*100]%
" @@ -299,59 +310,55 @@ contents += "[A.name]
" contents += "[A.desc]
" contents += "Stockpiled Amount: [A.held_items[1] + A.held_items[2]]
" - contents += "Bounty Price: [A.payout_price]
" - contents += "Withdraw Price: [A.withdraw_price]
" + contents += "Bounty Price: [A.payout_price]
" + contents += "Withdraw Price: [A.withdraw_price]
" contents += "Demand: [A.demand2word()]
" if(A.importexport_amt) - contents += "\[Import [A.importexport_amt] ([A.get_import_price()])\] \[Export [A.importexport_amt] ([A.get_export_price()])\]
" - contents += "\[[A.withdraw_disabled ? "Enable" : "Disable"] Withdrawing\]

" + contents += "\[Import [A.importexport_amt] ([A.get_import_price()])\] \[Export [A.importexport_amt] ([A.get_export_price()])\]
" + contents += "\[[A.withdraw_disabled ? "Enable" : "Disable"] Withdrawing\]

" if(TAB_IMPORT) - contents += "\[Return\]" - contents += " \[Compact: [compact? "ENABLED" : "DISABLED"]\]
" + contents += "\[Return\]
" contents += "
Imports
" contents += "--------------
" - if(compact) - contents += "Treasury: [SStreasury.treasury_value]m" - contents += " / Lord's Tax: [SStreasury.tax_value*100]%" - contents += " / Guild's Tax: [SStreasury.queens_tax*100]%

" - for(var/datum/roguestock/import/A in SStreasury.stockpile_datums) - contents += "[A.name]:" - contents += " \[Import [A.importexport_amt] ([A.get_import_price()])\]

" - else - contents += "Treasury: [SStreasury.treasury_value]m
" - contents += "Lord's Tax: [SStreasury.tax_value*100]%
" - contents += "Guild's Tax: [SStreasury.queens_tax*100]%

" - for(var/datum/roguestock/import/A in SStreasury.stockpile_datums) - contents += "[A.name]
" - contents += "[A.desc]
" - if(!A.stable_price) - contents += "Demand: [A.demand2word()]
" - contents += "\[Import [A.importexport_amt] ([A.get_import_price()])\]

" + contents += "Treasury: [SStreasury.treasury_value]m
" + contents += "Lord's Tax: [SStreasury.tax_value*100]%
" + contents += "Guild's Tax: [SStreasury.queens_tax*100]%
" + for(var/datum/roguestock/import/A in SStreasury.stockpile_datums) + contents += "[A.name]
" + contents += "[A.desc]
" + if(!A.stable_price) + contents += "Demand: [A.demand2word()]
" + contents += "\[Import [A.importexport_amt] ([A.get_import_price()])\]

" if(TAB_BOUNTIES) - contents += "\[Return\]" + contents += "\[Return\]
" contents += "
Bounties
" contents += "--------------
" contents += "Treasury: [SStreasury.treasury_value]m
" - contents += "Duke's Tax: [SStreasury.tax_value*100]%

" + contents += "Lord's Tax: [SStreasury.tax_value*100]%
" for(var/datum/roguestock/bounty/A in SStreasury.stockpile_datums) contents += "[A.name]
" contents += "[A.desc]
" contents += "Total Collected: [A.held_items[1] + A.held_items[2]]
" if(A.percent_bounty) - contents += "Bounty Price: [A.payout_price]%

" + contents += "Bounty Price: [A.payout_price]%

" else - contents += "Bounty Price: [A.payout_price]

" + contents += "Bounty Price: [A.payout_price]

" if(TAB_LOG) - contents += "\[Return\]
" + contents += "\[Return\]
" contents += "
Log
" contents += "--------------


" for(var/i = SStreasury.log_entries.len to 1 step -1) contents += "[SStreasury.log_entries[i]]
" + contents += {" + + + "} if(!canread) contents = stars(contents) - var/datum/browser/popup = new(user, "VENDORTHING", "", 500, 800) + var/datum/browser/popup = new(user, "VENDORTHING", "", 370, 220) popup.set_content(contents) + popup.set_window_options("can_minimize=0;can_maximize=0") popup.open() #undef TAB_MAIN