skull132 443a49a49b Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

..

admin

Adds an option to use templates from the WI in command reports (#474)

2016-07-05 21:23:09 +03:00

alarm

…

assembly

Radio Jammers (#502)

2016-07-09 03:14:04 +03:00

awaymissions

…

cciaa

…

client

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

clothing

Fix #529 (#536)

2016-07-09 03:44:07 +03:00

customitems

…

detectivework

…

economy

Fowl's Bugfixes 1 (#521)

2016-07-10 01:13:29 +03:00

events

Fowl's Bugfixes 1 (#521)

2016-07-10 01:13:29 +03:00

examine

…

ext_scripts

…

flufftext

…

food

Fixes #454 and Hivenet (#453)

2016-06-25 00:38:12 +03:00

games

…

genetics

…

holodeck

…

hydroponics

Vaurca Content 2 (#426)

2016-06-24 14:55:44 +03:00

icon generation

…

intern

Removing the camera from the heist hardsuit + Intern loadouts (#497)

2016-06-30 02:39:48 +03:00

library

…

lighting

Fix lighting quick (#449)

2016-06-24 21:47:09 +03:00

liquid

…

maps

…

materials

Adding an improvised shotgun (#420)

2016-06-23 02:26:54 +03:00

mining

Gun update (#387)

2016-06-23 02:16:57 +03:00

mob

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

nano

…

organs

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

overmap

…

paperwork

Welding Tool tweaks (#517)

2016-07-05 22:59:21 +03:00

power

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

projectiles

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

random_map

…

reagents

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

recycling

Cyborg beakers and grippers (#338)

2016-05-31 01:09:31 +03:00

research

Merge branch 'master' into development

2016-07-10 14:25:54 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Vaurca Patch 3.00; Fixes #496 (#493)

2016-07-10 01:09:56 +03:00

tables

Cyborg beakers and grippers (#338)

2016-05-31 01:09:31 +03:00

telesci

…

vehicles

…

virus2

…

web_interface

…