Ccomp5950 3aa766c689 Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change

2014-06-10 19:49:42 -05:00

..

admin

Mentor permissions fixes and such.

2014-06-10 19:48:41 -05:00

assembly

…

awaymissions

…

client

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-05-24 19:02:16 -05:00

clothing

Fixes shoulder holster

2014-06-08 15:25:04 +01:00

customitems

…

destilery

…

detectivework

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

economy

Fixes runtime error when copying the stamped EFTPOS paper

2014-06-06 20:45:39 +02:00

events

Replaces the now non-existing "unused assembly line" with another area.

2014-05-01 13:33:58 +02:00

ext_scripts

Bot down? Let's not lock up the entire server.

2014-05-29 21:36:34 -05:00

flufftext

…

food

…

genetics

…

icon generation

…

library

Targeting eyes with book/paper shows book/paper

2014-05-03 19:56:55 +03:00

liquid

…

maps

…

mining

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

mob

Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change

2014-06-10 19:49:42 -05:00

nano

…

organs

Fixed an issue with IBs being almost twice as bad

2014-06-05 00:02:44 +02:00

paperwork

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

power

Fixes #5098

2014-06-01 21:09:30 +09:30

projectiles

Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi.

2014-05-15 14:46:27 +09:30

reagents

Feed other text fix

2014-06-10 10:37:43 +10:00

recycling

refactors some disposals filtering code and remaps some disposals pipes

2014-06-01 23:30:20 +01:00

research

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

scripting

…

security levels

…

supermatter

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

surgery

…

virus2

Fixes circuit var for other consoles

2014-05-22 18:05:57 -04:00