Zuhayr b0d8ee7861 Merge resolution.

2013-07-26 23:17:48 -07:00

..

admin

Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.

2013-07-25 18:30:24 +01: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

Added employment records.

2013-07-24 22:23:50 -04: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

Several ZAS fixes.

2013-07-25 21:34:12 -07:00

food

…

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

Made mechas able to bump-mine

2013-07-25 15:40:03 +02:00

mob

Merge resolution.

2013-07-26 23:17:48 -07: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

Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.

2013-07-25 18:30:24 +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

…

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