paprka 668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs ...

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm

2014-10-08 07:17:42 -07:00

..

admin

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05: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 #5077 from Steelpoint/DeathSquad

2014-10-07 20:00:57 -07:00

detectivework

The rest of the junk

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

events

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

2014-10-04 19:22:10 -05: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 #4516 from MrPerson/examinate_the_doctor

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

mob

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

2014-10-08 07:17:42 -07:00

nano

…

paperwork

Merge pull request #4516 from MrPerson/examinate_the_doctor

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

power

Merge pull request #5097 from phil235/Msg1Fix

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

projectiles

Merge pull request #5103 from paprka/largebow

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

reagents

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05: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

…