Commit Graph

12723 Commits

Author SHA1 Message Date
Zuhayr
582a8e817a Fixes a runtime with drones building lights. 2014-05-11 22:31:27 +09:30
Zuhayr
45255e9e2e Whoops. 2014-05-11 22:07:24 +09:30
Zuhayr
a570f02835 Removed a redundant line. 2014-05-11 22:03:28 +09:30
Zuhayr
85279c97c4 Added toggle verb for drones. 2014-05-11 22:00:34 +09:30
Zuhayr
538bba9c42 Join As Drone and drone rebooting will now check cyborg jobbans. 2014-05-11 21:38:45 +09:30
Zuhayr
ff56d3e1bb Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers. 2014-05-11 21:38:29 +09:30
Zuhayr
84ec5b6849 Merge branch 'weapons' of https://github.com/Zuhayr/Baystation12 into dev 2014-05-11 20:44:25 +09:30
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
Zuhayr
7ded31ce4c Merge pull request #4921 from Jarcolr/UnusedIcons
Adds 5 satchels for jobs when selecting "satchel" for backpack pref from code
2014-05-10 02:41:57 +09:30
Chinsky
cb3ef4dc19 Merge pull request #4936 from Hubblenaut/paperbundle
Paperbundle
2014-05-09 20:43:08 +04:00
Zuhayr
5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
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
Jarcolr
dd8ce90fa7 Else Ifs 2014-05-09 16:06:44 +03:00
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
2c9faec5c4 Merge pull request #4937 from Ccomp5950/player_age_fix
Bugfix:  Brand new players will have a client.player_age of 0
2014-05-08 13:25:27 +04:00
Chinsky
520ae404ed Merge pull request #4931 from Mloc/bs12-rsv
voting: failed gamemode votes will undelay too
2014-05-08 13:20:27 +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
Chinsky
dbc6011018 Merge pull request #4928 from Ccomp5950/bugfixs
[Bugfix] Fixes partial prints.
2014-05-08 13:10:48 +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
b7d455a64b [Bugfix] Fixes partial prints.
Playays will now no longer leave complete prints from touching an item once.

Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.

You have a 1/100 chance of leaving a full set of prints on your first touch.

Fixes #4176
2014-05-07 02:17:08 -05: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
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
Hubblenaut
0f74b0f3bb Ability to spawn a paper bundle by hitting paper with paper 2014-05-06 20:26:53 +02:00
Jarcolr
12d2d616c1 5 unique satchels when selecting "satchel"
Enabled for RD, Xenobiologist , Scientist, Botanist, Virologist,
Geneticist, Chemist

http://puu.sh/8BqEX.png http://puu.sh/8BriB.png
2014-05-06 16:54:23 +03:00
Hubblenaut
4dbd3252c9 No 'Record Lost' or different records when printing out Medical/Security Records and switching to another record 2014-05-06 05:37:03 +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
Hubblenaut
d1d42d7c35 Ability to access Medical Console by clicking it with ID card 2014-05-06 03:59:54 +02:00
Hubblenaut
7908142f16 Adds Station Time to Crew Manifest Printouts 2014-05-06 03:43:10 +02:00
Hubblenaut
0ddba6d771 Adds Crewmember's name to Medical and Security Record Printouts 2014-05-06 03:36:11 +02:00