MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious ...

Conflicts:
	code/controllers/subsystem/ticker.dm

2015-05-02 03:03:29 -07:00

..

sheets

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

tiles

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

cash.dm

Day Who-Knows: Bar Gambling Expansion!

2015-03-29 18:09:54 -05:00

medical.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

rods.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

stack.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00