Commit Graph

7314 Commits

Author SHA1 Message Date
Ccomp5950
699cbbfd96 Merge pull request #4941 from Zuhayr/dev
Maintenance drones.
2014-05-10 03:55:21 -05:00
Ccomp5950
025576828a Merge pull request #4942 from mwerezak/radsuit-storage
Rad suits can hold rad hoods and gasmasks
2014-05-10 03:09:18 -05:00
Chinsky
cb3ef4dc19 Merge pull request #4936 from Hubblenaut/paperbundle
Paperbundle
2014-05-09 20:43:08 +04:00
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Zuhayr
656c555f4a Merge pull request #4914 from Jarcolr/ColoredLabcoats
Adds 5 new colored lab coats
2014-05-09 22:03:01 +09:30
Mike
06c2002cfb Rad suits can hold rad hoods and gasmasks
Allows rad hoods and gasmasks to be "clipped" to radiation suits using
the suit storage.
2014-05-08 22:14:19 -04:00
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Hubblenaut
e277349e0e dynamic description and fixes 2014-05-08 20:15:25 +02: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
Chinsky
5a3a32ec02 Merge pull request #4919 from Hubblenaut/paperwork
Record Printout Changes and improved Console Interaction
2014-05-08 13:16:20 +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
Hubblenaut
488f645f07 Adds the ability to remove the item viewed 2014-05-08 06:47:05 +02:00
Zuhayr
601d4516ad Merge pull request #4927 from Ccomp5950/muzzle-fix
Stops muzzled folks from talking.
2014-05-08 11:05:25 +09:30
Hubblenaut
435240ce2e Added ability to put paper bundles into folders and cabinets 2014-05-08 00:56:32 +02:00
Hubblenaut
8e08231c3a Adds functionalities for viewing, writing, stamping and adding photos 2014-05-07 22:50:15 +02:00
Mloc
fa6e32ca5c Merge pull request #4922 from mwerezak/power
Fixed cell chargers being infinite energy sources.
2014-05-07 21:48:54 +01:00
Ccomp5950
37e33cba9a AdminPM fixes
Invisimins won't show what their rank is it will simply say "Admin"

Non-staff won't get to see the adminlink (?)

People receiving adminPM's won't get the wrong version of it allowing them to only reply to themselves.

Removed the commented out stuffs.
2014-05-07 13:56:25 -05:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Ccomp5950
1861c7607f Stops muzzled folks from talking. 2014-05-06 21:38:47 -05:00
Hubblenaut
e620d41f41 Adds basic functionality to paperbundles 2014-05-07 03:54:05 +02:00
Zuhayr
0d597fe8db Merge pull request #4912 from Ccomp5950/mentors
Adds Mentors.
2014-05-07 10:00:27 +09:30
Zuhayr
a1f6b7a211 Merge pull request #4885 from mwerezak/equipment-fixes
Misc Equipment fixes - Mostly hardsuits
2014-05-07 09:59:44 +09:30
DJSnapshot
c0a53c52b7 Merge pull request #4913 from Zuhayr/master
Changeling, nymph and robot fixes.
2014-05-06 16:25:31 -07:00
Mike
59cb5af50e Updated PACMAN comments. 2014-05-06 16:45:54 -04:00
Hubblenaut
0f74b0f3bb Ability to spawn a paper bundle by hitting paper with paper 2014-05-06 20:26:53 +02:00
Hubblenaut
87cc10a2d3 Updates the Screen even when usr is using another console 2014-05-06 04:54:06 +02:00
Ccomp5950
6f71b8bf10 Merge pull request #4901 from Jarcolr/magicmissiles
Removes unusable magic missiles from artificers spell tab
2014-05-05 21:38:54 -05:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Mloc
e53d384321 Merge pull request #4909 from Ccomp5950/dionaea_say_code
Dionaea nymphs now using new say code and get languages again.
2014-05-05 20:56:27 +01:00
Zuhayr
87d29b25fd Merge pull request #4916 from Intercross21/master
And another hotfix for #4908
2014-05-06 01:15:42 +09:30
Intercross21
0e40a3f2dd And little more fixes 2014-05-05 19:38:09 +04:00
Zuhayr
089e23d7f2 Merge pull request #4915 from Intercross21/master
Emergency hotfix for #4908
2014-05-06 01:05:26 +09:30
Intercross21
cef243188a AH with link 2014-05-05 19:25:50 +04:00
Zuhayr
6adb394450 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-05-05 23:44:49 +09:30
Jarcolr
88c52b96d9 Adds 5 new colored lab coats
5 new colored labcoats: green, blue, red, orange, purple.

Credits to Nienhaus:
http://baystation12.net/forums/viewtopic.php?f=44&t=9984
2014-05-05 17:13:57 +03:00
Zuhayr
47ded267fb Merge pull request #4908 from Intercross21/master
Some inner changes for admin verbs
2014-05-05 23:37:49 +09:30
Zuhayr
051edb4fc1 Fixes #4421 2014-05-05 16:57:27 +09:30
Zuhayr
ffdba855fa Fixes #3741 2014-05-05 14:50:22 +09:30
Zuhayr
48262ae9dc Robots will now take burn damage from appropriate projectiles, rather than recieving brute. 2014-05-05 14:49:25 +09:30
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
Ccomp5950
c8c67da6ac Dionaea nymphs now using new say code and get languages again.
dionaea will understand and be understood by humans if they have stolen any blood, it's assumed they learned common.

and a minor fix in hear_say for observers to not get not see simple_animals in (parens) since they have no real_name.
2014-05-04 16:11:10 -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
11e5c64c78 Unified interface for options of admin 2014-05-04 18:37:42 +04:00
Ccomp5950
93bee94c10 Saycode herp derp. client check checking speaker client instead of hearers. 2014-05-04 09:27:14 -05: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
ce376eda1d Merge pull request #4894 from Zuhayr/master
IPC fixes.
2014-05-04 13:49:00 +01:00
Jarcolr
4ac2f5f136 Removes unusable missiles from artificers 2014-05-04 01:28:24 +03:00
Jarcolr
76b65f59a9 Targeting eyes with book/paper shows book/paper
This is a way to show other players papers without giving them the
paper/book.
2014-05-03 19:56:55 +03:00