phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor ...

Conflicts:
	code/modules/reagents/chemistry/holder.dm

2016-02-06 20:38:16 +01:00

..

devices

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

2016-02-06 20:38:16 +01:00

robot

More merge conflict fixes.

2016-02-04 15:48:33 +01:00

stacks

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

2016-02-04 14:34:45 +01:00

weapons

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

2016-02-06 20:38:16 +01:00

apc_frame.dm

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

blueprints.dm

Merge remote-tracking branch 'upstream/master' into blueprintsarea

2016-01-30 01:29:26 +00:00

body_egg.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

bodybag.dm

Adds large cardboard boxes to the game, constructable from five sheets of cardboard.

2015-09-10 19:29:19 -04:00

candle.dm

- Refactor the visible_message() proc to be much faster.

2016-01-04 22:49:27 +01:00

crayons.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

dehy_carp.dm

So I must bury it.

2015-11-10 23:46:17 +00:00

documents.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

holotape.dm

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

latexballoon.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

nuke_tools.dm

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

shooting_range.dm

Adds extra HONK. Tweaks sprite.

2015-09-09 16:27:21 -04:00

toys.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

trash.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00