Commit Graph

40 Commits

Author SHA1 Message Date
PsiOmega
23bb747364 Merge remote-tracking branch 'upstream/master' into dev 2014-11-26 22:10:09 +01:00
GinjaNinja32
a543d557b9 Fix sub-1 thaler piles being invisible, disallow subdivision below 0.01 2014-11-24 18:56:41 +00:00
GinjaNinja32
20779aac33 Fix ultra-rich people crashing the server 2014-11-24 18:11:09 +00:00
PsiOmega
7bb5b51954 Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event
Conflicts:
	code/modules/events/event_manager.dm
2014-11-12 10:18:45 +01:00
PsiOmega
bd885164f1 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
Conflicts:
	code/global.dm
2014-11-08 10:26:45 +01:00
PsiOmega
77c52f48a8 Newscaster and photo cleanup
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
2014-11-06 13:28:17 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega
ff14da90b3 Random Event Overhaul
Alters the event controller based on http://baystation12.net/forums/viewtopic.php?f=5&t=10706.
Exception is that there is always some start time variance to prevent metagaming.

Mundane, moderate, and major events run on their own timers and start and run independantly of each other.
Multiple events of the same severity degree can run at the same time. However, currently only one instance of the same event can be active at a time.
2014-11-03 09:22:37 +01:00
PsiOmega
9c41148a08 PDA newscaster
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
2014-10-28 17:10:35 +01:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
00871b5207 Fixes #6724 2014-10-16 14:47:09 +10:30
Hubblenaut
c783549015 Option to withdraw chargecard or cash at ATM 2014-09-28 21:53:19 +02:00
Hubblenaut
e7620cd81a Spacecash is now stackable and called 'Thalers' 2014-09-28 21:52:56 +02:00
PsiOmega
68bf885e6b Announcement system refactoring.
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Hubblenaut
2151e279cc Fixes Runtime Error, doesn't query for PIN on lowest account security level 2014-07-21 12:08:50 +02:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Hubblenaut
a522cf9399 Fixes runtime error when copying the stamped EFTPOS paper 2014-06-06 20:45:39 +02:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny
Mutiny Mode
2014-05-28 00:13:42 -05:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
igalan
7e8ff266a1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ewallet
Conflicts:
	icons/obj/items.dmi
2014-04-21 06:07:02 +01:00
igalan
fdb3d55483 -Printable transaction logs. 2014-04-18 05:42:25 +01:00
igalan
44c5fad3a0 -Added Malsquando's icon to items.dmi
-Changed Reset transaction link to Back and made it to not ask for code if already paid.
2014-04-18 03:00:44 +01:00
igalan
60fbe4b3be First commit for review:
-ATMs no longer spawn spacecash when you Withdraw funds from them. Instead they spawn a charge card with the funds asked.
-You can swipe a charge card at an EFTPOS instead of your ID. The funds will be substracted from the charge card and won't ask for any PIN.
(ID card swiping is still available, of course)
-You can insert a change card in a vending machine. You can retrieve multiple products from the machine as long as the change card has enough funds to pay for them.

-Also, the EFTPOS instructions are rewritten into a simpler text. The text is not final.

Needed:
-A better name than "change card"? Also, until a name is set, variables are keeping the name "ewallet".
-An icon for the change card. For now it's using the 1000$ cash icon as placeholder.
2014-04-17 01:48:06 +01:00
igalan
67fb9e510d -Ewallet can be extracted and inserted from and into ATMs.
-Working with EFTPOS.

Todos:
-Vending machines.
-Proper icon.
-Proper name.
-Test.
2014-04-15 07:41:54 +01:00
igalan
10e76d9762 E-Wallet object added.
Made ATM to spawn e-wallets.

Untested.
2014-04-15 05:27:23 +01:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Segrain
b04d00ff7b Typo fix. 2014-02-22 06:54:11 +03:00
RKF45
9b62f7b23d Small fixes, again 2014-01-04 21:26:28 +01:00
Jeremy Liberman
6bd00eb561 Emag ATMs to drop money 2013-11-23 16:59:30 -06:00
Kilakk
99321389f2 Fixes #3886, ATMs no longer log you in automagically
Silly security level 0 ruined everything
Added a tiny sanity check as well to avoid runtimes
2013-11-14 21:45:25 -05:00
Chinsky
1488850ad1 Merge pull request #3803 from Nanai/dev
Drinks Pack/Spritefixes and Vending Machine Loadout
2013-10-21 04:30:15 -07:00
Nanai
50f2f0ae46 Removes pin necessity on vending machines. 2013-10-21 07:12:23 -04:00
Segrain
188e68feb8 Money spawning. 2013-10-21 05:06:46 +03:00
Segrain
9a662594f2 Cash money. 2013-10-21 05:04:45 +03:00
Chinsky
57497f9b12 Renamed file so defines go before they are used.
<3 DM FOR IGNORING MANUAL DME EDITS LIKE THAT
2013-09-30 21:06:42 +04:00
ZekeSulastin
01201ce473 Made modules/detectivework and economy lowercase 2013-09-30 00:22:32 -04:00