Chinsky 5d3e712d64 Merge branch 'master' into dev-freeze ...

Conflicts:
	html/changelog.html

2013-11-30 05:11:36 +04:00

..

admin

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

2013-11-24 23:37:09 +00:00

assembly

…

awaymissions

Cleaned the fuck out of smoke.

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

client

Made the telesci console a proper NanoUI

2013-11-13 08:01:00 -05:00

clothing

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

2013-11-24 23:37:09 +00: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

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

economy

Fixes #3886, ATMs no longer log you in automagically

2013-11-14 21:45:25 -05:00

events

Event Rebalance!

2013-11-16 02:09:28 -05:00

ext_scripts

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

flufftext

…

food

Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad.

2013-09-30 02:02:49 -04:00

genetics

…

icon generation

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

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

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

2013-11-24 23:37:09 +00:00

nano

Multiple minor updates to Nano.

2013-09-19 01:39:59 +01:00

organs

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

2013-11-24 23:37:09 +00:00

paperwork

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

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

power

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

2013-11-24 23:37:09 +00:00

projectiles

Merge branch 'master' into dev-freeze

2013-11-30 05:11:36 +04:00

reagents

Merge branch 'master' into dev-freeze

2013-11-30 05:11:36 +04: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

Changes Telescience to Projectile Trajectory!

2013-11-28 17:50:09 +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

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

2013-11-24 23:37:09 +00:00

telesci

Changes Telescience to Projectile Trajectory!

2013-11-28 17:50:09 +04:00

virus2

GC's virus dummies #whoa #derp

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