Ccomp5950 98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm

2014-03-18 19:44:19 -05:00

..

area

Merge branch 'dev-freeze' into dev

2014-03-10 19:05:24 +04:00

dna

Revert "derp"

2014-02-21 18:17:15 +11:00

gamemodes

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

jobs

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

machinery

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

2014-03-18 19:44:19 -05:00

magic

…

mecha

Fixed the bug where mech fabricators would get stuck whenever the RnD console was not found.

2014-03-04 23:51:12 +01:00

objects

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

2014-03-18 19:44:19 -05:00

turfs

ChangeTurf()... We meet again...

2014-02-24 06:39:50 -07:00

vehicles

…

verbs

Fix for mods counting.

2014-02-02 02:33:53 +03:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Adding blood to humans.

2014-02-09 13:32:42 +03:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Fixed supply shuttle bug wherein the area types were actually tags.

2014-03-02 06:53:11 -07:00