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

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

admin

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

2013-08-31 17:45:31 +01:00

assembly

…

awaymissions

Added two ears back.

2013-08-27 22:05:27 +01:00

client

Comments out preload_vox() as it causes long delays with initial start window and subsequent windows when first logged in.

2013-08-29 22:08:11 +01:00

clothing

Added light to previous commit.

2013-08-29 03:38:52 -07:00

customitems

…

destilery

…

detectivework

…

DetectiveWork

…

events

…

ext_scripts

…

flufftext

…

food

…

genetics

…

icon generation

…

library

Revert "Experimentally readding Delete Book verb."

2013-08-21 09:10:21 +01:00

liquid

…

maps

…

mining

…

mob

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

2013-08-31 17:45:31 +01:00

nano

Fixed issue with links/buttons not working until first update.

2013-08-28 22:20:13 +01:00

organs

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

2013-08-31 17:45:31 +01:00

paperwork

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

2013-08-31 17:45:31 +01:00

power

Commented out APC switching from Malf AI.

2013-08-25 02:35:05 -07:00

projectiles

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

2013-08-31 17:45:31 +01:00

reagents

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

2013-08-31 17:45:31 +01:00

recycling

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

research

Reagent scanner's addition.

2013-08-17 17:00:33 +03:00

scripting

…

security levels

…

surgery

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

virus2

Merge pull request #3572 from Baystation12/master

2013-08-22 23:01:15 -07:00