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

Conflicts:
	code/modules/food&drinks/food/snacks_pastry.dm

2015-01-21 20:25:45 +11:00

..

devices

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

robot

fixed compile errors

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

stacks

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

weapons

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

2015-01-21 16:54:40 +11:00

apc_frame.dm

…

blueprints.dm

Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.

2015-01-18 20:46:30 +00: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

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

shooting_range.dm

Repaths practice laser

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

toys.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

trash.dm

…