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

Conflicts:
	code/modules/admin/admin_verbs.dm

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

..

admin

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

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

assembly

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

2014-09-25 18:45:53 +02: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 #5039 from paprka/hatstation13

2014-10-04 20:51:08 -05: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

Standardizes name and path of plastique/plastic explosive/c4 to C4

2014-09-21 17:34:26 +10:00

food&drinks

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

2014-10-05 13:48:11 +02: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

Merge pull request #4815 from phil235/AudibleMsgFix

2014-09-27 15:01:56 +02:00

mining

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

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

mob

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

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

nano

Giacom Fixes

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

paperwork

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

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

power

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

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

projectiles

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

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

reagents

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

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

recycling

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

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

research

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

2014-10-04 19:22:10 -05: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

…