diff --git a/code/modules/stock_market/articles.dm b/code/modules/stock_market/articles.dm
index 305fabff1f5fa..f5e3d2dce57dc 100644
--- a/code/modules/stock_market/articles.dm
+++ b/code/modules/stock_market/articles.dm
@@ -1,5 +1,5 @@
proc/consonant()
- return pick("B","C","D","F","H","J","K","L","M","N","P","Q","R","S","T","V","W","X","Y","Z")
+ return pick("B","C","D","F","G","H","J","K","L","M","N","P","Q","R","S","T","V","W","X","Y","Z")
proc/vowel()
return pick("A", "E", "I", "O", "U")
diff --git a/code/modules/stock_market/computer.dm b/code/modules/stock_market/computer.dm
index 9bc48b8c5a397..8defb75105ea8 100644
--- a/code/modules/stock_market/computer.dm
+++ b/code/modules/stock_market/computer.dm
@@ -50,7 +50,7 @@ a.updated {
if (!(logged_in in LR))
LR[logged_in] = 0
dat += "View mode: [vmode ? "compact" : "full"]"
-
+ dat += "Stock Transaction Log: Check"
dat += "
Listed stocks
"
if (vmode == 0)
@@ -60,7 +60,7 @@ a.updated {
mystocks = S.shareholders[logged_in]
dat += "
[S.name] ([S.short_name])[S.bankrupt ? "
BANKRUPT" : null]
"
if (S.last_unification)
- dat += "
Unified shares [(ticker.times_fired - S.last_unification) / 600] minutes ago.
"
+ dat += "
Unified shares [(world.time - S.last_unification) / 600] minutes ago.
"
dat += "
Current value per share: [S.current_value] |
View history"
dat += "You currently own
[mystocks] shares in this company. There are [S.available_shares] purchasable shares on the market currently.
"
if (S.bankrupt)
@@ -75,7 +75,7 @@ a.updated {
for (var/datum/borrow/B in S.borrow_brokers)
dat += "
[B.broker] offers
[B.share_amount] shares for borrowing, for a deposit of
[B.deposit * 100]% of the shares' value.
"
dat += "The broker expects the return of the shares after
[B.lease_time / 600] minutes, with a grace period of
[B.grace_time / 600] minute(s).
"
- dat += "
This offer expires in [(B.offer_expires - ticker.times_fired) / 600] minutes."
+ dat += "
This offer expires in [(B.offer_expires - world.time) / 600] minutes."
dat += "
Note: If you do not return all shares by the end of the grace period, you will lose your deposit and the value of all unreturned shares at current value from your account!
"
dat += "
Note: You cannot withdraw or transfer money off your account while a borrow is active.
"
dat += "
Take offer (Estimated deposit: [B.deposit * S.current_value * B.share_amount] credits)
"
@@ -85,10 +85,10 @@ a.updated {
if (B.borrower == logged_in)
dat += "You are borrowing
[B.share_amount] shares from
[B.broker].
"
dat += "Your deposit riding on the deal is
[B.deposit] credits.
"
- if (ticker.times_fired < B.lease_expires)
- dat += "You are expected to return the borrowed shares in [(B.lease_expires - ticker.times_fired) / 600] minutes.
"
+ if (world.time < B.lease_expires)
+ dat += "You are expected to return the borrowed shares in [(B.lease_expires - world.time) / 600] minutes.
"
else
- dat += "The brokering agency is collecting. You still owe them
[B.share_debt] shares, which you have [(B.grace_expires - ticker.times_fired) / 600] minutes to present.
"
+ dat += "The brokering agency is collecting. You still owe them
[B.share_debt] shares, which you have [(B.grace_expires - world.time) / 600] minutes to present.
"
var/news = 0
if (logged_in)
var/list/LR = stockExchange.last_read[S]
@@ -133,7 +133,6 @@ a.updated {
else
dat += "
+ - "
dat += "
(A) (H)"
-
dat += "