Commit Graph

208 Commits

Author SHA1 Message Date
Jeremy Liberman
bd249e3a53 Mutiny Mode
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
2014-05-15 01:01:54 -04:00
Rob Nelson
9d53cfa446 Moved Vox DMI to a subfolder, added species-based random-naming, fixed preview.
Tested.

Conflicts:
	code/game/gamemodes/vampire/vampire_powers.dm
	code/game/gamemodes/vox/heist/heist.dm
	code/modules/admin/verbs/one_click_antag.dm
	code/modules/events/heist.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
2014-05-14 04:32:18 -04:00
Ccomp5950
8097d25b26 Bugfix: Brand new players will have a client.player_age of 0
Before:  When a client is created it's player_age variable is set to "Requires Database", then a select query is ran against the database to see if they have been seen before if they have logged in before this will have a row for them and it will set player age.  However if there is no row for them it doesn't change player_age from default.

After:   Before we check for an entry in the database we set their player_age to zero, we already checked we have a database connection so we know we will be able to pull this information and if we can't then it means they are a new player.  Set their player_age to zero and be done with it.

What this does:  Brand new players will no longer be able to bypass the jobs minimal age limit.
2014-05-13 00:15:11 -04:00
Ccomp5950
7c97361d86 Jobs you can't select are struckthrough instead of just being red.
Before:  It's going to be kinda confusing when a new player goes to setup their jobs and they see this: http://i.imgur.com/miK9Isk.png
Specifically "unavailable occupations are in red" and then a list of days till they can play that role but also RED [NEVER] which to a new player migth cause confusion thinking
they can never play that role.

After:  Remove the red and add a strikethrough ( http://i.imgur.com/BQ90xr6.png  ) to show "these jobs are unavailable" while making the other jobs look, well more available.

Conflicts:
	code/modules/client/preferences.dm
2014-05-13 00:14:00 -04:00
Ccomp5950
15c889f186 Code for new bots allowing admins to PM Players via IRC and vice versa.
Conflicts:
	code/modules/ext_scripts/irc.dm
2014-05-12 04:45:13 -04:00
Ccomp5950
970525d065 Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/controllers/configuration.dm
	code/game/verbs/who.dm
	code/modules/admin/admin_ranks.dm
	config-example/config.txt
2014-05-04 21:37:37 -04:00
ZomgPonies
db136cc457 Fixed a savefile bug with saving skin colors for taj etc 2014-05-04 20:41:29 -04:00
Brian Cook
ce40b74fd7 Improved GUI for requesting pAI
Made the pAI Request Module and the pAI Availability List pretty.

Conflicts:
	code/modules/mob/living/silicon/pai/recruit.dm
2014-04-29 20:46:43 -04:00
Brian Cook
a93f864ae3 Refined GUI more
pAI background updated and no longer externally referenced. Corrected
stray typos. Added more power on/off lights for certain downloaded
modules.
2014-04-29 20:39:24 -04:00
suethecake
8245876226 FIX 2 ELECTRIC BOOGALOO 2014-04-29 14:09:12 -04:00
suethecake
fdf3c669f8 Fixes small issues in save files. 2014-04-29 14:08:56 -04:00
suethecake
10b7a2e8d9 Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/species.dm
	code/setup.dm
2014-04-29 13:58:56 -04:00
Ccomp5950
13a72f4a04 Crash fix attempt: Moving NanoUI resource file sending away from client/New()
it's going in mob/Login() instead.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/mob/login.dm
2014-04-28 18:51:57 -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
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