phil235 45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix ...

Conflicts:
	code/modules/recycling/disposal.dm

2014-10-15 18:23:40 +02:00

..

admin

Merge pull request #5144 from Jordie0608/partsofbancodearesougly

2014-10-10 13:53:22 -07:00

assembly

Merge pull request #5236 from phil235/SignalerBugFix

2014-10-15 10:44:51 -03:00

awaymissions

Makes the gateway unacidable.

2014-10-12 20:43:15 +03:00

client

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00

clothing

Merge pull request #5181 from paprka/maskflippanreal

2014-10-13 11:43:23 +01:00

crafting

On second thought, leave the result as just a path

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

detectivework

…

events

Merge pull request #5220 from Menshin/false_alarm_runtimes_fix

2014-10-15 11:57:21 +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

Ian emotes while eating again. Fixed #5147

2014-10-11 14:35:35 +02:00

hydroponics

Fixes the ability to make stacks of grasstile/sandstone larger than the max amount authorized.

2014-10-14 21:22:08 +02:00

library

bookcases no longer opaque

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

mining

Merge pull request #5253 from phil235/SandstoneStackFix

2014-10-15 10:46:58 -03:00

mob

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

2014-10-15 18:23:40 +02:00

nano

…

paperwork

Prevent using force pull on paper bins to grab them from the other side of the station.

2014-10-12 01:43:27 +02:00

power

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

2014-10-15 18:23:40 +02:00

projectiles

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

2014-10-15 18:23:40 +02:00

reagents

Merge pull request #5093 from paprka/medipens

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

recycling

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

2014-10-15 18:23:40 +02: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

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00