Commit Graph

2838 Commits

Author SHA1 Message Date
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
Brian Cook
cca92a2e85 Improved GUI for requesting pAI
Made the pAI Request Module and the pAI Availability List pretty.
2014-04-26 17:10:37 -07:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Ccomp5950
e548fe6e43 Crash fix attempt: Moving NanoUI resource file sending away from client/New()
it's going in mob/Login() instead.
2014-04-25 17:47:27 -05:00
Brian Cook
6d67400f74 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-24 18:17:41 -07:00
DJSnapshot
6082340077 super quick fix. Didn't realize my antag option thing would produce a null unclickable state. 2014-04-19 23:38:43 -07:00
Ccomp5950
daed8dd7ec Code for new bots allowing admins to PM Players via IRC and vice versa. 2014-04-16 23:14:17 -05:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -07:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Segrain
fd738a5767 Smallfix. 2014-02-22 06:54:48 +03:00
DJSnapshot
009b4737af fix for semi-annoying typo. 2014-02-15 23:54:32 -08:00
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag
Conflicts:
	icons/mob/uniform.dmi
2014-02-04 23:55:27 -08:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Mark Aherne (Faerdan)
214fbeee99 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.
2014-01-12 15:30:25 +00:00
Mark Aherne (Faerdan)
1f50cae6c2 SMES NanoUI
* Converted SMES to NanoUI.
2014-01-12 01:28:03 +00:00
Zuhayr
a96c17fd75 Mixed up some whitelist flags. 2014-01-07 20:53:42 +10:30
Zuhayr
2a2fffc616 Fixed a duplicate definition bug with WHITELISTED. 2014-01-05 23:36:16 +10:30
Fira
de7c480439 Added GhostRadio -- Allowing ghosts to spy on radio from anywhere 2014-01-04 12:25:09 +01:00
Zuhayr
c6c1a575d6 Merge of blood file, ammo icons, map. Manual binary file merge incoming. 2013-12-28 23:13:04 +10:30
Chinsky
ee6a18d94d Adds White UI to selectable UIs 2013-12-24 23:05:41 +03:00
Ccomp5950
ec7921909f NANOUI PDA
Creates NanoUI for the PDA and Syndicate Uplink.

New features:
	Crew manifest now sorted with department heads at the top.
	Can select individual conversations and delete individual conversations among PDA's
	Powernet Monitor much more simple now and easier to read.
	Janitorial supplies locator now includes Janicart.
	Items will actually refresh if you click "Refresh"

Some other changes:
	Captain's PDA cartridge now has all access (added janitor access and quartermaster access)
	With the conversation change I had to change how tnote (the variable that holds PDA messages works.
		Setup the message server to use the new methods.
	Removed procs that will no longer be used (UI generation procs from old UI methods)
	Commented everything the best I can.
	Created HORRIBLE, TERRIBLE lists.  But it's pretty much required because that's how nanoUI rolls.
	Created a variable on the uplink called NanoUI items, this list is created upon creation of the
		uplink.

	I included the functionality for Mimes and Clowns for our downstream servers that have those.
2013-12-22 06:18:39 -06:00
Chinsky
a9549ac036 Merge pull request #4003 from volas/dev
Custom UI
2013-12-10 10:37:13 -08:00
volas
6841906228 Custom UI 2013-11-30 15:10:42 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev
Conflicts:
	icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
DJSnapshot
8813123997 added config flags for objectives being enabled or disabled.
added antag options menu.
added ability to choose where a syndicate uplink is installed.
2013-11-29 17:02:23 -08:00
Nanai
2416ae715c Full Eye and Robot Organ Implementation
Tested work to implement eyes ad internal organs and the charpref selectable robotic organ replacements for heart and eyes, both for assisted and fully mechanical variants!
2013-11-14 13:08:29 -05:00
Michael Johnson
bcd140a691 Made the telesci console a proper NanoUI 2013-11-13 08:01:00 -05:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-29 05:33:23 +10:00
Chinsky
463adc446f Fancy ghosts!
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
2013-10-06 16:10:47 +04:00
Mark Aherne (Faerdan)
e0924bf4ab Multiple minor updates to Nano.
Created new DNA Modifier Nano UI.

Refactored the DNA Modifier code.
2013-09-19 01:39:59 +01:00
Erthilo
9e17473f62 Uncomments books. Generifies mentions of tg or baystation. 2013-09-02 18:24:11 +01:00
Erthilo
4f6948885c Comments out preload_vox() as it causes long delays with initial start window and subsequent windows when first logged in. 2013-08-29 22:08:11 +01:00