DJSnapshot 7665a1a00e Merge pull request #3895 from Baystation12/master ...

Merge Dev with Master

2013-11-07 16:31:43 -08:00

..

admin

Merge pull request #3895 from Baystation12/master

2013-11-07 16:31:43 -08:00

assembly

…

awaymissions

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

client

tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)

2013-10-29 05:33:23 +10:00

clothing

Merge pull request #3832 from Nanai/dev

2013-10-27 16:21:10 -07:00

customitems

Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo.

2013-10-27 19:17:45 -04:00

destilery

…

detectivework

…

economy

Merge pull request #3803 from Nanai/dev

2013-10-21 04:30:15 -07:00

events

derp

2013-11-05 03:17:44 +04:00

ext_scripts

…

flufftext

…

food

…

genetics

…

icon generation

…

library

Added two new manuals by MagmaRam to the default engineering manual bookcase.

2013-10-27 18:25:25 -04:00

liquid

…

maps

…

mining

Fixed Copypasta!

2013-11-02 11:17:17 -07:00

mob

Forgot to remove lying icons / need for them for monkeys. Ook.

2013-11-06 23:54:13 +04:00

nano

…

organs

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

paperwork

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

2013-10-15 10:56:50 +04:00

power

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

projectiles

Changed the embed check to use its own var instead of checking damagetype

2013-10-31 22:05:58 -04:00

reagents

Merge pull request #3895 from Baystation12/master

2013-11-07 16:31:43 -08:00

recycling

fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected

2013-10-29 05:10:17 +10:00

research

Updated paths for smoke generator

2013-11-06 22:44:56 +04:00

scripting

…

security levels

Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.

2013-11-07 16:02:57 -08:00

surgery

Small fix for head reattachment surgery.

2013-10-30 17:20:18 -04:00

telesci

Note to self: Remember to push your nerfs next time.

2013-11-06 19:10:35 -08:00

virus2

GC's virus dummies #whoa #derp

2013-11-05 01:13:49 +04:00