Jordie0608 25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-06-20 17:32:16 +10:00

..

backpack.dm

Merge remote-tracking branch 'remotes/upstream/master' into thaw

2015-06-19 11:23:45 -04:00

bags.dm

add icon for chemistry bag

2015-06-04 19:17:44 +01:00

belt.dm

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

book.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

boxes.dm

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

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

briefcase.dm

Fixing some message and sound.

2014-09-13 00:46:57 +02:00

fancy.dm

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

firstaid.dm

defib changes

2015-02-08 17:06:34 -08:00

lockbox.dm

"You hear something" set to italics.

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

secure.dm

span classes removed from visible.messages

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

storage.dm

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

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

toolbox.dm

Welder&toolboxes update

2015-04-01 10:43:22 +12:00

uplink_kits.dm

Fixes #9066, removes description on Noslips

2015-04-27 14:03:51 -05:00

wallets.dm

Day Who-Knows: Bar Gambling Expansion!

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