mwerezak 69284990a3 Merge remote-tracking branch 'upstream/dev' into runtime ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm

2015-02-15 22:24:36 -05:00

..

admin

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

2015-02-15 22:24:36 -05:00

assembly

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

awaymissions

Conflict fix

2015-02-03 20:57:16 +03:00

client

Accessories update.

2015-02-08 12:35:50 +03:00

clothing

Replaces text expressions with macros

2015-02-12 01:55:12 -05:00

customitems

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

2015-02-15 22:24:36 -05:00

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

distillery

…

economy

…

events

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

2015-02-03 15:18:27 -08:00

ext_scripts

…

flufftext

…

food

Replaces uplink Donk-pockets with Sin-Pockets.

2015-02-11 09:55:50 +01:00

games

…

genetics

…

holodeck

Missing files added

2015-02-04 20:40:39 +08:00

hydroponics

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

2015-02-15 22:24:36 -05:00

icon generation

…

library

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

liquid

…

maps

…

mining

Merge master into dev.

2015-02-12 23:01:08 +10:30

mob

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

2015-02-15 22:24:36 -05:00

nano

pAI rework

2015-02-09 01:58:54 +00:00

organs

Antibodies rework.

2015-01-26 05:32:00 +00:00

overmap

Compile fix

2015-02-03 08:39:39 +03:00

paperwork

Lightly boosts the clerical kit.

2015-02-10 20:12:32 +01:00

power

Merge master into dev.

2015-02-12 23:01:08 +10:30

projectiles

Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC.

2015-02-10 22:39:40 +01:00

random_map

Readded asteroid secret placement, adjusted some values.

2015-01-23 13:40:10 +10:30

reagents

Adds a kit with cigarette packs and zippo lighter.

2015-02-12 16:35:49 +01:00

recycling

Merge master into dev.

2015-02-12 23:01:08 +10:30

research

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

scripting

…

security levels

…

shieldgen

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

shuttles

…

supermatter

…

surgery

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Fixes startup runtime

2015-02-06 08:54:28 +00:00