Commit Graph

23 Commits

Author SHA1 Message Date
ZomgPonies
048ac0994d 2nd commit of MySQL conversion. So close to the finish line. 2014-06-03 03:31:06 -04:00
ZomgPonies
59f63f6413 First commit converting playerfiles to MySQL 2014-06-02 22:02:15 -04:00
Rob Nelson
61609ab2f9 Add superjuke, fix more bugs with joukbucks.
Conflicts:
	code/modules/media/jukebox.dm
2014-05-18 18:47:30 -04:00
Rob Nelson
f1e09dd3e1 More juke bugs 2014-05-18 18:43:55 -04:00
Rob Nelson
48978767c8 Jukebox casters should work now. (Tested) 2014-05-18 18:43:44 -04:00
Rob Nelson
b66d0b002f Jukebox supports being moved. 2014-05-17 22:04:50 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
Rob Nelson
b34d436756 Fix jukebox formatting 2014-04-19 20:37:01 -04:00
Rob Nelson
0221e5bdff Fix jukebox after hammering it :V 2014-04-19 20:33:35 -04:00
Rob Nelson
2389e9a778 Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken. 2014-04-19 20:33:22 -04:00
Rob Nelson
6d7040e735 A few remaining jukebox bugs
Conflicts:
	code/modules/media/mediamanager.dm
2014-04-19 20:21:44 -04:00
Rob Nelson
ac5fcf31a5 Autoplay after power restoration when emagged. 2014-04-19 20:03:33 -04:00
Rob Nelson
cf4b9f5e42 Emaggable jukebox. 2014-04-19 20:02:42 -04:00
d3athrow
dd1613f6c4 you can set the volume of the jukebox now, preferences tab -> set volume
Conflicts:
	code/modules/media/mediamanager.dm
2014-04-19 18:58:56 -04:00
Necaladun
0288be9081 Jukebox
Adding missing , because i need more coffee
2014-04-16 18:27:44 +09:30
Necaladun
fdabde9f84 Jukebox additions
Removed empty jazz playlist, added papers please and aussie music
2014-04-16 17:26:52 +09:30
Rob Nelson
ce7bb71ff7 le typo face 2014-03-23 08:19:40 -04:00
Rob Nelson
20467bded7 Fix a bunch of jukebox bugs, add and implement new sprites. 2014-03-22 06:29:39 -04:00
Rob Nelson
935de91fe0 Fixes ghost Entered not being called. 2014-03-16 21:50:55 -04:00
ZomgPonies
ae07381acf Cuts the jukebox volume! 2014-03-14 03:33:42 -04:00
Rob Nelson
fa55782e92 Fuck
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
	tools/OpenBYOND
2014-03-12 02:23:05 -04:00
Rob Nelson
5c8ddf2a31 YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED
Conflicts:
	code/__HELPERS/game.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/firedoor.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
	maps/tgstation.2.1.0.0.1.dmm
2014-03-11 02:28:58 -04:00
Rob Nelson
8fb14a26e9 Initial commit of media suite
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/area/areas.dm
	code/modules/client/client defines.dm
2014-03-10 19:01:41 -04:00