Commit Graph

16952 Commits

Author SHA1 Message Date
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
Zuhayr
601d4516ad Merge pull request #4927 from Ccomp5950/muzzle-fix
Stops muzzled folks from talking.
2014-05-08 11:05:25 +09:30
Zuhayr
8053d259ae Merge pull request #4930 from Mloc/bs12-mappatcherpatched
tools: adding the patched/fixed MapPatcher.jar
2014-05-08 11:04:59 +09:30
Mloc
fa6e32ca5c Merge pull request #4922 from mwerezak/power
Fixed cell chargers being infinite energy sources.
2014-05-07 21:48:54 +01:00
Mloc
b001039fb9 Merge pull request #4932 from Ccomp5950/adminpm-fix
AdminPM fixes
2014-05-07 20:19:52 +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
073059e0dc tools: adding the patched/fixed MapPatcher.jar
Allows for easier map conflict resolution.
Prompts the user for confirmation on a tile conflict instead of dying.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-07 17:33:05 +01:00
Ccomp5950
1861c7607f Stops muzzled folks from talking. 2014-05-06 21:38:47 -05: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
Mike
36dbb67ceb Fixed air alarm heaters using 1000x less power...
...than they should. Note that MAX_ENERGY_CHANGE is 1000, so air alarm
heaters will now draw a maximum of 1 kW instead of 1 W, much more
befitting of a heater.
2014-05-06 20:12:40 -04:00
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
Mike
a538357b3e Fixed cell chargers being infinite energy sources 2014-05-06 16:43:16 -04:00
Ccomp5950
58b88b3390 Merge branch 'Ravensdale-APCsanity' 2014-05-05 21:34:20 -05:00
Ccomp5950
e43305fcc4 Merge branch 'APCsanity' of https://github.com/Ravensdale/Baystation12 into Ravensdale-APCsanity
MapPatcher had to be run.
2014-05-05 21:23:40 -05: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
3dfe1dd196 Replacement dionaea sprites intended to be pushed a long while back. 2014-05-06 04:46:48 +09:30
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
Zuhayr
47ded267fb Merge pull request #4908 from Intercross21/master
Some inner changes for admin verbs
2014-05-05 23:37:49 +09:30
Zuhayr
5492531094 Fixes #4534 2014-05-05 17:18:55 +09:30
Zuhayr
051edb4fc1 Fixes #4421 2014-05-05 16:57:27 +09:30
Zuhayr
c44e7b0e56 Fixes #4495. 2014-05-05 16:14:59 +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
Zuhayr
1123e896c0 Merge pull request #4875 from mwerezak/medmaint
Fixed medbay maintenance wierdness
2014-05-05 13:51:52 +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
Intercross21
aa7ad269ae Little change: "show" button shows job only first time. Now shows job anytime. 2014-05-05 07:20:26 +04: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
e05efd0f1e New job menu for ID computer. 2014-05-04 22:06:56 +04:00
Mloc
8168635929 Merge pull request #4906 from Ccomp5950/herpderp
Saycode herp derp.  client check checking speaker client instead of hearers
2014-05-04 17:07:50 +01: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
Ccomp5950
c7262a55d4 Merge pull request #4897 from Mloc/bs12-zeroburn
zas: fix zburn /0 runtime
2014-05-04 10:06:02 -05:00
Intercross21
11e5c64c78 Unified interface for options of admin 2014-05-04 18:37:42 +04:00
Ccomp5950
3739ed03ff Merge pull request #4905 from Jarcolr/properhudobject
Cyborg hud modules now have proper icon states
2014-05-04 09:36:32 -05: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
Jarcolr
e050251c81 Cyborg hud modules now have proper icons
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
2014-05-04 16:06:10 +03:00
Mloc
ce376eda1d Merge pull request #4894 from Zuhayr/master
IPC fixes.
2014-05-04 13:49:00 +01:00
Ravensdale
82e8c34211 Mapping sanity project-APC's 2014-05-03 17:38:18 -07:00
Mloc-Argent
3fb37ade17 zas: fix zburn /0 runtime
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 17:40:35 +01:00
Mloc
6683cece0b Merge pull request #4895 from Ccomp5950/irc-pm-fix
Canceling an IRC-adminPM will not send a blank message.
2014-05-03 17:10:27 +01:00
Mike
bc1a529683 Fixes for last two commits. 2014-05-03 11:40:20 -04:00
Zuhayr
54f24c5cc6 Merge pull request #4896 from Ccomp5950/robutt-say-fix-hopefully-oh-dear-god
Trimming messages prior to say code processing.
2014-05-04 00:51:45 +09:30
Ccomp5950
ed25b7c870 Canceling an IRC-adminPM will not send a blank message.
Ooops
2014-05-03 09:27:59 -05:00
Zuhayr
0e39f18763 Compile fix. 2014-05-03 23:17:08 +09:30