comma ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2013-07-09 12:48:34 +04:00

..

admin

Merge branch 'BEF-staging'

2013-07-08 23:28:22 +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

HUDs and visibility.

2013-07-09 04:53:34 +03:00

customitems

Added procs for a custom item that were overlooked.

2013-07-06 23:53:59 -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

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

Merge branch 'master' into bleeding-edge-freeze

2013-07-09 12:48:34 +04: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

Merge pull request #2816 from comma/HTML

2013-05-24 14:30:36 -07:00

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 'BEF-staging'

2013-07-08 23:28:22 +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