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

Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme

2015-12-17 20:12:32 -05:00

..

devices

Merge pull request #13681 from swankcookie/lantern_sprite

2015-12-17 07:19:30 -06:00

robot

unifies energy gun self charging

2015-11-22 17:37:26 +11:00

stacks

Line ending apocalypse

2015-12-17 14:12:37 +13:00

weapons

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

2015-12-17 20:12:32 -05: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

Slime blueprints

2015-10-30 04:42:20 -05:00

body_egg.dm

I screwed up that merge

2015-08-14 21:36:35 -06: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

Enables ghost to go through ladders

2015-11-28 18:14:52 +01:00

crayons.dm

Made it possible to paint windows to make them opaque.

2015-11-01 16:26:54 +00: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

Line ending apocalypse

2015-12-17 14:12:37 +13:00

trash.dm

Makes burn_state use defines

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