Zulker Nayeen Nahiyan 490027405a Merge remote-tracking branch 'origin/dev' into dev ...

Conflicts:
	code/modules/virus2/helpers.dm

2015-01-19 02:15:38 +06:00

..

admin

Fix for blood drip overlaying + secret feature

2015-01-15 20:10:32 +10:30

assembly

…

awaymissions

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

client

Fixes bad gear datum paths

2015-01-12 00:19:01 -05:00

clothing

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

customitems

Fixes lab coat without icon.

2014-12-12 14:30:12 +01:00

detectivework

…

distillery

Fixes typos and indenting present in the destilery module, and renames it to distillery

2015-01-09 20:49:36 +06:00

economy

Merge resolution.

2015-01-12 07:17:02 +10:30

events

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

ext_scripts

…

flufftext

…

food

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

games

…

genetics

…

hydroponics

Fixes #7636

2015-01-03 06:53:29 +10:30

icon generation

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

library

…

liquid

…

maps

* Made the preloader independant of the called New().

2014-12-23 23:47:30 +01:00

mining

Merge pull request #7491 from Mloc/bs12-sleepyedges

2014-12-22 20:04:08 +01:00

mob

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

nano

…

organs

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

paperwork

Ghost labeller fix

2015-01-15 21:21:13 +13:00

power

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

projectiles

Makes shotguns not break on point-blank fire.

2014-12-29 21:03:55 -06:00

reagents

Merge resolution.

2015-01-12 07:17:02 +10:30

recycling

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

2015-01-06 12:36:28 -05:00

research

Fixes typo in engineering research description

2015-01-10 04:25:50 +01:00

scripting

…

security levels

…

shieldgen

Moves all circuitboards to their respective files.

2014-12-17 14:31:21 +01:00

shuttles

Updates references

2014-12-27 00:03:20 +01:00

supermatter

…

surgery

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

vehicles

More cargo train fixes

2015-01-03 01:27:10 +13:00

virus2

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00