Commit Graph

195 Commits

Author SHA1 Message Date
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
DJSnapshot
843ac65077 Undershirts and rolling down jumpsuits!
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	icons/mob/human.dmi
	icons/mob/uniform.dmi
2014-04-19 16:17:14 -04:00
Necaladun
f7246e3a40 Swap NT Rep and Customs Officer costs
30 for NT Rep, 15 for Customs Officer to represent their importance.
2014-04-15 00:37:27 +09:30
ZomgPonies
b46d780611 Fix Jukebox stopping radio 2014-03-19 00:21:58 -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
ZomgPonies
f0aa94356a Savefiles out of date 2014-03-03 00:08:12 -05:00
ZomgPonies
ee85462e08 Fuck fonts forever always 2014-02-28 16:03:49 -05:00
ZomgPonies
f545101e87 Merge branch 'font'
Conflicts:
	code/modules/client/client procs.dm
	code/stylesheet.dm
	fonts/skrell.ttf
	fonts/slime.ttf
2014-02-28 15:26:59 -05:00
ZomgPonies
77417edf6e Revert "New fonts work first iteration"
This reverts commit 172a4dfc51.
2014-02-04 02:47:14 -05:00
ZomgPonies
0b86695573 Broken font shit? 2014-02-04 02:29:50 -05:00
ZomgPonies
172a4dfc51 New fonts work first iteration 2014-02-04 00:54:24 -05:00
ZomgPonies
bd946b0ab1 Fixes for new species 2014-01-28 16:33:02 -05:00
ZomgPonies
ede85dbcc5 Fix preferences menu 2014-01-28 02:01:41 -05:00
ZomgPonies
40ef1367ad Fix for player preferences 2014-01-28 00:09:25 -05:00
ZomgPonies
7014f6f83e More fixes to text2speech 2014-01-27 16:58:52 -05:00
ZomgPonies
808143f976 Final text2voice commit 2014-01-27 13:03:25 -05:00
Rob Nelson
f44ff1d7aa Standardize FAT
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_grab.dm
2014-01-21 22:57:10 -05:00
Rob Nelson
b5a1eff678 Add ghost radio
Conflicts:
	code/modules/client/preferences.dm
	code/world.dm
2014-01-17 13:10:00 -05:00
ZomgPonies
48403dcc8e A lot of fixing up job preferences. 2014-01-16 09:18:49 -05:00
ZomgPonies
2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
d3athrow
c8ceab5aa2 Adds Randomized Character Slot, if enabled picks a random populated character slot to use upon round start. Does not affect late joins for now.
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	html/changelog.html
2014-01-16 00:48:24 -05:00
Mark Aherne (Faerdan)
06541aecc5 NanoUI assets are now sent to the client automatically.
* NanoUI now finds and sends it's assets to the client (css, images, javascript and templates).

Part of my effort to make creating NanoUIs as simple as possible. This removes the need to add new NanoUI assets (such as templates) to the client send_resources proc.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/nano/nanomanager.dm
2014-01-12 21:28:14 -05:00
Mark Aherne (Faerdan)
11ff90b718 SMES NanoUI
* Converted SMES to NanoUI.

Conflicts:
	code/modules/power/smes.dm
2014-01-11 22:07:00 -05:00
ZomgPonies
906d3b80d8 Small nanoui change 2014-01-07 18:24:38 -05:00
ZomgPonies
9e61df6bdb Bugfix 2014-01-07 05:52:52 -05:00
Zuhayr
e09a00fe0e Fixed a duplicate definition bug with WHITELISTED.
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
2014-01-06 23:59:21 -05:00
ZomgPonies
81f8e50131 Nano fix 2014-01-06 17:47:24 -05:00
ZomgPonies
1f39392543 Little compile fixes 2014-01-05 23:36:36 -05:00
ZomgPonies
1457095556 Fix Tajaran fat spawns maybe? 2014-01-05 16:40:12 -05:00
ZomgPonies
af92092f64 Fixed Slimaggedon spawning -- Uses antag menu 2014-01-04 22:11:16 -05:00
ZomgPonies
895cb05392 Preload vox sounds no workie good 2014-01-04 03:15:01 -05:00
ZomgPonies
eb44938358 Vox sound updates 2014-01-03 21:43:40 -05:00
ZomgPonies
2573088771 PDA NanoUI 2013-12-22 16:03:21 -05:00
ZomgPonies
21666af24d Organ/Surgery Overhaul Part 2 2013-12-19 08:59:02 -05:00
ZomgPonies
912601a30d Vampire Gamemode! 2013-12-13 19:38:49 -05:00
ZomgPonies
ebb29c625e Custom HUD colors 2013-11-30 18:30:18 -05:00
ZomgPonies
58b953251a Preferences updates 2013-11-28 13:21:07 -05:00
ZomgPonies
29114f7bb3 Added appearance bans granularity option 2013-11-24 02:47:56 -05:00
ZomgPonies
55b34b192d Nano and fixes 2013-11-19 03:30:27 -05:00
ZomgPonies
fffcd7e49b Atmos Computer NanoUI 2013-11-18 01:17:59 -05:00
ZomgPonies
60994c591d /tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\ 2013-11-10 13:14:22 -05:00
ZomgPonies
988a9b7494 Fixes for Grey species 2013-11-07 16:16:20 -05:00
ZomgPonies
307d853ef0 Ingame Karma Shop Menu 2013-11-06 13:56:58 -05:00
Fox-McCloud
3c8f618380 Minor Tweaks
Fixes various minor issues here and there (including improper items for
chemistry repair), allows coloration of Tajaran, Unathi, and Skrell
hair+facial hair, and adds a few new food items.
2013-11-03 00:34:20 -04:00
ZomgPonies
4630518535 Player menu overhaul! 2013-11-01 08:17:05 -04:00
ZomgPonies
6bf566b84d Visual IDs + Stamps = ALL GLORY TO CYBERIAD 2013-10-31 09:21:15 -04:00
ZomgPonies
b2b3faebc0 Removed Skellingtons, stupid idea 2013-10-31 03:50:44 -04:00
ZomgPonies
a227fa6cbe Removed zombies, added Skellingtons for halloween. Some bug fixes 2013-10-31 03:21:34 -04:00
ZomgPonies
2df877bf82 Xenoarch update 2013-10-29 11:56:04 -04:00