Jordie0608 3bd637b186 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/patch.dm
	code/modules/reagents/reagent_containers/pill.dm

2015-01-19 18:28:38 +11:00

..

devices

Mutadone and Mannitol, tweaks and changes.

2015-01-16 19:28:13 -08:00

robot

fixed compile errors

2014-12-24 21:03:22 -08:00

stacks

…

weapons

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

2015-01-19 18:28:38 +11:00

apc_frame.dm

…

blueprints.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into CargoCrateNameFix

2015-01-05 22:07:08 +01:00

bodybag.dm

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

candle.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

crayons.dm

Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet.

2015-01-03 13:44:23 -06:00

documents.dm

…

latexballoon.dm

…

shooting_range.dm

Repaths practice laser

2015-01-07 04:45:49 -03:00

toys.dm

further conflicts and bugfixes

2015-01-15 21:59:36 -08:00

trash.dm

…