phil235 4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 ...

Conflicts:
	icons/obj/food.dmi

2015-04-09 17:38:14 +02:00

..

backpack.dm

removes soh singulo interaction

2015-03-26 13:19:56 +11:00

bags.dm

Splitting food.dmi into smaller files.

2015-04-03 21:59:56 +02:00

belt.dm

Merge pull request #7419 from paprka/beltoveray

2015-02-20 07:06:20 +03:00

book.dm

Day Who-Knows: Bar Gambling Expansion!

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

boxes.dm

Adding the chemical reactions and recipes for the new recipes.

2015-04-04 19:29:12 +02:00

briefcase.dm

…

fancy.dm

Splitting food.dmi into smaller files.

2015-04-03 21:59:56 +02:00

firstaid.dm

defib changes

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

lockbox.dm

Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.

2015-03-09 21:48:45 +00:00

secure.dm

Day Who-Knows: Bar Gambling Expansion!

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

storage.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

toolbox.dm

Welder&toolboxes update

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

uplink_kits.dm

changes and tweaks

2015-02-28 22:13:11 -08:00

wallets.dm

Day Who-Knows: Bar Gambling Expansion!

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