Kelenius c3312be968 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	maps/exodus-1.dmm

2015-03-30 10:35:37 +03:00

..

admin

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

alarm

…

assembly

…

awaymissions

…

client

Merge remote-tracking branch 'upstream/dev' into sanitize_procs

2015-03-25 01:06:32 +03:00

clothing

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-29 16:23:06 +02:00

customitems

Chemistry commit

2015-03-25 19:09:10 +03:00

detectivework

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

economy

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

events

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

examine

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Makes holo objs slightly transparent

2015-03-27 10:32:41 -04:00

hydroponics

Should fix issues with invisible seeds/products/plants.

2015-03-24 13:51:44 +10:30

icon generation

…

library

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

liquid

…

maps

…

mining

Updates drill and scanner

2015-03-24 18:34:26 +03:00

mob

Merge branch 'dev' into ofChemistryAndStuff

2015-03-30 10:35:37 +03:00

nano

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

organs

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

overmap

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-13 09:31:03 +01:00

paperwork

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

power

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

2015-03-27 11:13:53 +10:30

projectiles

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

random_map

…

reagents

Merge branch 'dev' into ofChemistryAndStuff

2015-03-30 10:35:37 +03:00

recycling

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

research

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

First pass on making heist a pirate mode (human based)

2015-03-21 11:13:05 +10:30

spells

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-29 16:23:06 +02:00

supermatter

…

surgery

Chemistry commit

2015-03-25 19:09:10 +03:00

vehicles

…

virus2

Chemistry commit

2015-03-25 19:09:10 +03:00