Commit Graph

219 Commits

Author SHA1 Message Date
PsiOmega 00fcfa7899 Makes it possible to setup pAI configuration from the character setup screen. 2014-08-08 13:31:52 +02:00
PsiOmega 8568a6aa89 Explicit proc/Topic definitions. 2014-08-08 13:21:51 +02:00
Zuhayr ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Whitellama 0a0c18dbf6 Fixed issue with flavour text saving/loading from other characters 2014-07-26 18:50:34 -07:00
Chinsky 5fe8865f95 Merge pull request #5771 from JimTheCactus/name_fix
Added check for blank on name entry
2014-07-27 05:04:05 +04:00
Whitellama eb64769734 Cleaned up mistake implementing dynamic flavour text 2014-07-26 17:41:03 -07:00
Whitellama 8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama 0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
JimTheCactus 0b7e858000 Changes check to an isnull rather than a truth test
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-26 16:19:14 -06:00
DJSnapshot d4ce124fe0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-07-25 19:37:10 -07:00
DJSnapshot 9be6de1e77 fixes admin show-skills verb. 2014-07-25 19:34:13 -07:00
JimTheCactus b0db2ba347 Added check for blank on name entry
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-25 19:36:58 -06:00
DJSnapshot de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
DJSnapshot 2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
DJSnapshot f8d478fcbb Updates to gun targeting UI. Fixes #5710 2014-07-23 20:51:58 -07:00
Zuhayr 6981ca52f4 Trying to fix the loadout spawn issue, at least this will make it more informative. 2014-07-12 10:35:31 +09:30
Zuhayr 3955edd04b Final touches for loadout system. 2014-07-11 12:16:08 +09:30
Zuhayr 903679bd79 More work on gear loadouts. 2014-07-11 11:47:53 +09:30
Zuhayr 85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
GinjaNinja32 d389466c8a Fix Change UI verb 2014-07-05 21:28:11 +01:00
Zuhayr 4367d37332 Somehow when I added spawnpoints I put them in the wrong place. Moved the file. 2014-07-01 01:04:19 +09:30
Zuhayr 19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
mwerezak 03648c220e Adds workaround for PHP whitelist
Apparently there's some PHP script that needs to be updated or
something. Revert this once that is done.
2014-06-28 12:19:57 -04:00
Zuhayr 515e78f760 First pass on custom loadouts. 2014-06-25 15:47:38 +09:30
Zuhayr abc07e435c Minor formatting fix. 2014-06-24 13:41:59 +09:30
Zuhayr 96bbe1d9db Added spawnpoint datum, moved existing latejoin spawn to datum setup. 2014-06-24 13:33:48 +09:30
Hubblenaut 1e09995f63 Wheelchairs spawn on footless characters 2014-06-05 22:50:42 -04:00
Jeremy Liberman d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950 0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Ccomp5950 ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
mwerezak 87dfeab0f3 Adds secondary languages for species 2014-05-22 16:17:52 -04:00
Chinsky 5b761f5207 Merge pull request #5011 from DJSnapshot/hotfix
Forgot I would need a null check.
2014-05-17 08:29:16 +04:00
DJSnapshot 56e3d0a37f Forgot I would need a null check. 2014-05-16 21:26:08 -07:00
Jeremy Liberman d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Argent 2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Chinsky 5426670a3d Merge pull request #4938 from Ccomp5950/banned_strikethrough
Jobs you can't select are struckthrough instead of just being red.
2014-05-08 13:26:37 +04:00
Ccomp5950 1f6ec81e40 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.
2014-05-08 01:05:12 -05:00
Ccomp5950 535840f0ae 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-08 00:18:06 -05:00
Mloc-Argent a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr 0d597fe8db Merge pull request #4912 from Ccomp5950/mentors
Adds Mentors.
2014-05-07 10:00:27 +09:30
Mloc-Argent 6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Ccomp5950 fe4f9b0df9 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.
2014-05-04 23:12:06 -05:00
Intercross21 d4ee83666e Now AH shows key, prefs.jobs not have scrollbar, prefs is fully visible except undo/save menus. 2014-05-04 19:41:14 +04:00
Intercross21 02ce933297 Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu. 2014-05-04 18:11:11 +04:00
Mloc-Argent e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00
Mloc f0726e5cee Merge pull request #4881 from Ccomp5950/botfix
Admin empowerment:  Allowing Admins in IRC to respond to ahelps
2014-05-03 11:04:43 +01:00
Ccomp5950 7f5b5bb5af Merge pull request #4851 from thelegendofbrian/pAI
pAI GUI Massive Update
2014-04-29 18:49:54 -05:00
suethecake 21c58eb2a3 FIX 2 ELECTRIC BOOGALOO 2014-04-27 12:31:10 -06:00
suethecake 95fc3c29e3 Fixes small issues in save files. 2014-04-27 12:29:25 -06:00
suethecake 2b2d64f05f 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! 2014-04-27 01:00:16 -06:00