Mloc-Argent b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	html/changelog.html

2013-12-13 19:13:43 +00:00

..

admin

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

2013-12-13 19:13:43 +00:00

assembly

…

awaymissions

Cleaned the fuck out of smoke.

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

client

Merge pull request #4003 from volas/dev

2013-12-10 10:37:13 -08:00

clothing

Grammar fix and fix to c45 being declared twice in boxes.dm

2013-12-08 12:25:00 -08:00

customitems

Requested removal.

2013-11-24 16:57:18 -06:00

destilery

…

detectivework

Massive click code rework by SuperSayu, ported from TG.

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

economy

Emag ATMs to drop money

2013-11-23 16:59:30 -06:00

events

DNA2 - A recode of DNA

2013-12-01 00:04:27 -08:00

ext_scripts

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

flufftext

…

food

Adds tofurkey and stuffing food items

2013-11-28 03:45:13 -06: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

R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate.

2013-11-20 15:19:24 -08:00

mob

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

2013-12-13 19:13:43 +00:00

nano

Multiple minor updates to Nano.

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

organs

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

2013-12-13 19:13:43 +00:00

paperwork

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

2013-12-13 19:13:43 +00:00

power

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

2013-12-13 19:13:43 +00:00

projectiles

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

2013-12-13 19:13:43 +00:00

reagents

Merge pull request #4012 from N3X15/dna2

2013-12-05 02:39:55 -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

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

2013-12-13 19:13:43 +00: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

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

2013-12-13 19:13:43 +00:00

virus2

DNA2 - A recode of DNA

2013-12-01 00:04:27 -08:00