comma da35278439 Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro ...

Conflicts:
	html/changelog.html

2013-07-11 02:53:58 +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

Updated HUDs to find only known viruses.

2013-07-09 13:04:05 +04: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

…

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

Updated HUDs to find only known viruses.

2013-07-09 13:04:05 +04:00

organs

Merge branch 'bleeding-edge-freeze' into viro

2013-07-01 17:33:24 +04:00

paperwork

…

power

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

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

projectiles

Adds fire delay to all weapons (except automatics).

2013-07-10 21:19:21 +04:00

reagents

Merge branch 'bleeding-edge-freeze' into viro

2013-07-01 17:33:24 +04:00

recycling

…

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

virus2

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

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