Mloc-Argent 08393161c0 Merge branch 'master' into BEF-staging ...

Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-07-04 13:08:28 +01:00

..

admin

Merge branch 'master' into BEF-staging

2013-07-04 13:08:28 +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

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

2013-06-30 20:02:36 -07:00

clothing

Fixes #3200

2013-06-29 16:57:08 -07:00

customitems

Custom item.

2013-07-01 19:21:49 -07: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

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

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

ext_scripts

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

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

flufftext

…

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

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

Merge branch 'master' into BEF-staging

2013-07-04 13:08:28 +01:00

organs

Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter.

2013-06-27 08:47:15 -07:00

paperwork

…

power

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

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

projectiles

Cleaned up a lot of the module selection code, added Combat module.

2013-06-29 22:14:43 -07:00

reagents

Message tweaks.

2013-06-28 15:55:41 -07:00

recycling

DRY BLOOD FOR THE BLOOD GOD.

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

research

Merge branch 'master' into BEF-staging

2013-07-04 13:08:28 +01:00

scripting

…

security levels

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

surgery

Fixes #3081

2013-06-21 18:00:25 -07:00