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

Conflicts:
	code/game/gamemodes/gang/recaller.dm

2015-06-28 08:30:00 -06:00

..

admin

Removes duplicate variable in adminhelp.

2015-06-27 16:49:39 -07:00

assembly

Merge from upstream.

2015-06-25 20:30:19 +02:00

awaymissions

…

client

Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner

2015-06-28 02:55:53 +03:00

clothing

Derp, I hate fixing merge conflicts...

2015-06-28 15:27:58 +02:00

crafting

Merge from upstream.

2015-06-25 20:30:19 +02:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

…

events

Merge from upstream.

2015-06-25 20:30:19 +02:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

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

2015-06-28 15:22:21 +02:00

games

…

holiday

…

html_interface

Fix for playing cards on systems with IE8

2015-06-27 05:51:59 +02:00

hydroponics

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

2015-06-28 08:30:00 -06:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

…

mining

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

mob

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

2015-06-28 15:22:21 +02:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Merge from upstream.

2015-06-25 20:30:19 +02:00

paperwork

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

power

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

2015-06-28 15:22:21 +02:00

procedural mapping

Merge from upstream.

2015-06-25 20:30:19 +02:00

projectiles

Merge from upstream.

2015-06-25 20:30:19 +02:00

reagents

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

2015-06-28 15:22:21 +02:00

recycling

Squashed Commits

2015-06-27 00:09:16 -06:00

research

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

2015-06-28 15:22:21 +02:00

scripting

Merge from upstream.

2015-06-25 20:30:19 +02:00

security levels

…

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

Merge pull request #10105 from xxalpha/chief

2015-06-26 19:03:13 +02:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00