Pete Goodfellow 0345f66d37 Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun ...

Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html

2013-05-28 17:34:01 +01:00

..

devices

* Edited encryptionkey.dm: Fixes about nineteen typos

2013-05-26 18:16:02 +12:00

robot

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

stacks

Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485

2013-05-23 20:19:04 -06:00

weapons

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

2013-05-28 17:34:01 +01:00

apc_frame.dm

-Committed lpeters's patch which Fixes Issue 1189. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11549

2012-12-24 01:38:36 +00:00

blueprints.dm

- Bugfix for user created areas not correctly powering machinery.

2013-01-14 17:46:33 +00:00

bodybag.dm

Standardises bodybag.dm, including text styling. Updates the max name length of a label. Fixes folded bodybags not fitting in boxes. Bodybags now go into hands when folded, if possible.

2013-04-04 00:43:09 +01:00

candle.dm

Expanded what can light things. Cigars and pipes can now be lit by standard sources. Standard sources are: Lighter, Zippo, Igniter, weldingtool, energy sword, and candles.

2013-03-13 16:17:02 +11:00

crayons.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

latexballoon.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

shooting_range.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

tk_grab.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-03-13 00:08:20 -03:00

toys.dm

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

trash.dm

Janitor/Wire/Hydro Sprite Stuff.

2013-03-29 23:33:40 -05:00