Zuhayr f09d1218fe Master to dev merge.

2014-08-11 17:23:40 +09:30

..

admin

Master to dev merge.

2014-08-11 17:23:40 +09:30

assembly

integrate XGM into the code

2014-07-22 19:52:12 +01:00

awaymissions

Updates eng rig path, adds obj sprites

2014-07-19 23:18:32 -04:00

client

Makes it possible to setup pAI configuration from the character setup screen.

2014-08-08 13:31:52 +02:00

clothing

Master to dev merge.

2014-08-11 17:23:40 +09:30

customitems

Master to dev merge.

2014-08-11 17:23:40 +09:30

destilery

…

detectivework

Master to dev merge.

2014-08-11 17:23:40 +09:30

economy

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

events

Added Calamity mode.

2014-07-30 21:09:25 +09:30

ext_scripts

…

flufftext

integrate XGM into the code

2014-07-22 19:52:12 +01:00

food

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-10 22:20:13 +01:00

games

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

genetics

…

hydroponics

Fixed #5912

2014-08-10 16:29:09 -04:00

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

2014-07-27 03:20:16 +09:30

mob

Master to dev merge.

2014-08-11 17:23:40 +09:30

nano

NanoUI updates.

2014-07-21 22:32:45 +01:00

organs

fixes nullpointer caused by broken organ list

2014-07-26 11:54:32 +02:00

paperwork

Master to dev merge.

2014-08-11 17:23:40 +09:30

power

Master to dev merge.

2014-08-11 17:23:40 +09:30

projectiles

Master to dev merge.

2014-08-11 17:23:40 +09:30

reagents

Master to dev merge.

2014-08-11 17:23:40 +09:30

recycling

Updates disposal bin pressurization

2014-08-07 19:31:17 -04:00

research

Removes telecomm and RD server temperature cap

2014-07-28 20:24:17 -04:00

scripting

…

security levels

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

shieldgen

Reorganizes shieldgen source code and icon files

2014-08-10 11:58:25 -04:00

shuttles

Master to dev merge.

2014-08-11 17:23:40 +09:30

supermatter

Master to dev merge.

2014-08-11 17:23:40 +09:30

surgery

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

2014-07-16 19:32:00 +09:30

vehicles

Fixes runtime in train/explode()

2014-08-10 18:37:39 -04:00

virus2

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

2014-07-16 19:30:41 +09:30