MrPerson 863f28f295 On second thought, leave the result as just a path ...

Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

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

Conflicts:
	code/game/objects/structures/tables_racks.dm

2014-10-10 14:30:41 -07:00

..

admin

fixes issue preventing admins from using hotkey mode

2014-10-07 15:30:42 -07:00

assembly

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

awaymissions

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

client

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

clothing

Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay

2014-10-09 13:46:59 -07:00

crafting

On second thought, leave the result as just a path

2014-10-10 14:30:41 -07:00

detectivework

The rest of the junk

2014-09-05 18:14:02 +04:00

events

Merge pull request #5106 from paprka/megacarps

2014-10-08 22:16:22 +01:00

flufftext

Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3

2014-10-06 19:27:14 -05:00

food&drinks

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

hydroponics

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

library

bookcases no longer opaque

2014-10-04 18:28:30 -07:00

mining

Merge pull request #4994 from paprka/miningainteasy

2014-10-08 14:44:35 -07:00

mob

Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay

2014-10-09 13:46:59 -07:00

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

power

big commit, handcuff overhaul

2014-10-08 13:19:54 -07:00

projectiles

Merge pull request #5120 from nivomi/turretsounds

2014-10-08 20:57:21 +02:00

reagents

Merge pull request #5093 from paprka/medipens

2014-10-08 22:15:52 +01:00

recycling

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

research

Merge pull request #5103 from paprka/largebow

2014-10-08 10:18:51 +01:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

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

2014-10-05 13:48:11 +02:00

shuttle

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

surgery

removing comment.

2014-09-21 22:26:18 +02:00

telesci

…