Iamgoofball 75b9f815d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs ...

Conflicts:
	code/game/machinery/vending.dm

2015-02-09 15:41:29 -08:00

..

devices

Literal shitton of changes

2015-02-07 15:37:55 -08:00

robot

UpdatedCoolingModule

2015-01-27 23:45:49 +08:00

stacks

Fixes icon updating for rods

2015-02-07 22:48:10 +01:00

weapons

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

2015-02-07 15:46:12 -08: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

Blargh removed commented code I'm fuckin' tired

2015-02-03 08:37:48 -06:00

trash.dm

…