PsiOmega 9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-01-21 08:53:27 +01:00

..

admin

Merge pull request #7885 from Baystation12/master

2015-01-20 18:49:03 +10:30

assembly

Noise emotes

2014-12-07 12:09:02 +00:00

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

Fixes body_parts_covered not updating when rolling jumpsuits

2015-01-14 22:38:52 -05:00

customitems

Fixes lab coat without icon.

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

destilery

…

detectivework

…

economy

Merge resolution.

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

events

Fixes #7547.

2015-01-15 15:01:38 +01:00

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

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

…

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 'upstream/dev-freeze' into dev

2015-01-21 08:53:27 +01:00

nano

Fixes #7199

2014-12-07 22:13:31 +10:30

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

Fixes two powernet related issues:

2015-01-20 21:12:52 +01:00

projectiles

Makes shotguns not break on point-blank fire.

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

reagents

Changes how sprays work and re-adds silicate

2015-01-17 19:11:41 +03:00

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

Supermatter warning now has its own proc. Fixed some SM bugs.

2014-11-30 00:23:55 +01:00

surgery

Merge pull request #7885 from Baystation12/master

2015-01-20 18:49:03 +10:30

vehicles

Fixes item anchoring on unload

2015-01-20 13:39:01 +13:00

virus2

Merge pull request #7850 from Baystation12/master

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