Chinsky 0d77262c69 Merge pull request #8885 from PsiOmegaDelta/EngineerMasterJob ...

Fixes #7943.

2015-04-18 16:55:06 +03:00

..

admin

Allow admins to drag-drop ghosts into mobs.

2015-04-15 08:49:00 +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' into CultPorting

2015-04-14 15:54:22 +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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-13 12:49:07 +01:00

icon generation

…

library

sanitize() refactor: fourth pass

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

liquid

…

maps

…

mining

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

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

mob

Merge pull request #8893 from Baystation12/dev-freeze

2015-04-18 21:50:40 +09:30

nano

Fixes NanoUI interaction.

2015-04-13 23:19:22 +02:00

organs

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation

2015-04-13 17:12:02 -04:00

overmap

…

paperwork

Small fix after merge

2015-04-09 21:07:43 +03:00

power

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

2015-04-14 15:54:22 +02:00

projectiles

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

2015-04-13 12:49:07 +01:00

random_map

…

reagents

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

recycling

sanitize() refactor: first pass (sanitize)

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

research

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

2015-04-14 15:54:22 +02:00

scripting

…

security levels

Allows admins to more easily set security levels.

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

shieldgen

Fixes #7943.

2015-04-18 11:52:03 +02:00

shuttles

Adds refresh button, fixes arrivals docking frequency.

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

spells

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

supermatter

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

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