Segrain fe0e1ecfb6 Conflict fix?

2013-07-25 09:55:35 +03:00

..

admin

Merge pull request #3330 from Kilakk/master

2013-07-21 18:50:12 -07:00

assembly

…

awaymissions

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

client

Properly reverts Kida. (what a mess)

2013-07-12 12:48:07 +01:00

clothing

Merge branch 'master' into bleeding-edge-freeze

2013-07-19 14:48:40 +01:00

customitems

Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request.

2013-07-22 17:37:39 +01:00

destilery

…

detectivework

Phasing out world loops, pt 1

2013-06-20 17:21:16 +04:00

DetectiveWork

Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC.

2013-06-21 14:40:36 +01:00

events

Fixes #3104.

2013-07-21 16:55:30 +01:00

ext_scripts

Updated the linkage between the NanoTrasen IRC bot and the server.

2013-07-02 23:41:40 +01:00

flufftext

Cobpipe fix

2013-05-31 00:21:48 -05:00

food

Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.

2013-04-23 22:52:08 +01:00

genetics

…

icon generation

…

library

…

liquid

…

maps

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

mining

Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.

2013-07-04 04:55:24 -07:00

mob

Conflict fix?

2013-07-25 09:55:35 +03:00

organs

Merge branch 'master' into bleeding-edge-freeze

2013-07-19 14:48:40 +01:00

paperwork

Beakers and other glass containers now hide their contents, only showing the amount.

2013-07-22 17:38:34 +01:00

power

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

projectiles

Merge branch 'master' into bleeding-edge-freeze

2013-07-19 14:48:40 +01:00

reagents

Beakers and other glass containers now hide their contents, only showing the amount.

2013-07-22 17:38:34 +01:00

recycling

DRY BLOOD FOR THE BLOOD GOD.

2013-06-01 10:56:59 +04:00

research

Merge branch 'BEF-staging'

2013-07-08 23:28:22 +01:00

scripting

…

security levels

Fixed #3290.

2013-07-10 22:58:23 +04:00

surgery

Typo fix, retractor step bugfix.

2013-07-25 03:06:06 +03:00

virus2

Makes engineered viruses airborne too, since otherwise they are nigh useless.

2013-07-09 14:16:58 +04:00