Neerti 191f197d79 Merge pull request #5 from Neerti/4/8/2015_bay_sync ...

Syncs to Bay (4/8/2015)

2015-04-10 09:41:51 -04:00

..

admin

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

alarm

…

assembly

…

awaymissions

…

client

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

clothing

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

customitems

Merge remote-tracking branch 'upstream/dev' into inventoryfix

2015-03-31 01:37:55 -04:00

detectivework

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

economy

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

events

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-03 09:33:05 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Fixes #8696

2015-03-31 20:30:06 -04:00

hydroponics

Merge pull request #8655 from volas/sanitize_procs2

2015-04-06 15:16:17 +02:00

icon generation

…

library

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

liquid

…

maps

…

mining

Merge pull request #5 from Neerti/4/8/2015_bay_sync

2015-04-10 09:41:51 -04:00

mob

Adds selectable default languages to all mobs which can speak

2015-04-08 15:18:59 +01:00

nano

Merge remote-tracking branch 'upstream/dev' into PCAILaws

2015-03-28 20:26:24 +01:00

organs

Some dislocation fixes/adjustments.

2015-04-07 19:50:26 -07:00

overmap

…

paperwork

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

power

Merge remote-tracking branch 'upstream/dev' into inventoryfix

2015-03-31 02:13:22 -04:00

projectiles

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

random_map

…

reagents

Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.

2015-04-06 18:40:11 -04:00

recycling

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

research

Fixes #8696

2015-03-31 20:30:06 -04:00

scripting

…

security levels

Allows admins to more easily set security levels.

2015-03-31 14:32:28 +02:00

shieldgen

…

shuttles

Adds refresh button, fixes arrivals docking frequency.

2015-04-02 00:26:45 -04:00

spells

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

supermatter

…

surgery

Fixes a monkey runtime and updates head reattachment surgery.

2015-04-04 20:03:54 -07:00

vehicles

…

virus2

Added macros for droplimb flags.

2015-03-31 11:42:45 +10:30