Miauw 5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization ...

Conflicts:
	code/_onclick/telekinesis.dm

2014-04-08 14:29:58 +02:00

..

admin

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

2014-04-08 14:29:58 +02:00

assembly

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

awaymissions

Revert "Merge pull request #3142 from Alek2ander/master"

2014-03-29 18:02:54 +04:00

client

Upgrades to the play admin midi client pref

2014-03-31 05:41:33 -07:00

clothing

Merge pull request #3343 from Giacom/small_fixes

2014-04-07 18:48:05 -07:00

detectivework

…

events

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

2014-04-08 14:29:58 +02:00

flufftext

Fixes the bug where players get deleted because of hallucinations. How the fuck did I screw this up so badly...

2014-03-22 21:55:52 -07:00

food

human-burgers now eject correctly

2014-04-03 22:50:02 +02:00

hydroponics

Merge pull request #3298 from Kelenius/hydrofix

2014-04-07 18:39:53 -07:00

library

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

2014-03-21 03:05:39 -07:00

mining

Merge pull request #3280 from MrPerson/mining_vouchers

2014-04-05 19:00:35 +02:00

mob

Merge pull request #3346 from Iamgoofball/FUCKMONKEY

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

nano

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

paperwork

Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite

2014-04-02 17:11:52 +01:00

power

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

2014-04-08 14:29:58 +02:00

projectiles

Updated to work with newer cyborg code.

2014-04-02 22:12:36 -06:00

reagents

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

2014-04-08 14:29:58 +02:00

recycling

Merge pull request #3329 from phil235/DisposalPipeFix

2014-04-08 02:04:51 -05:00

research

Span classes yaaaaay

2014-04-03 15:37:53 +04:00

scripting

fixes shit

2014-03-09 18:31:43 +01:00

security levels

Emergency Access Override Update

2014-03-15 14:59:39 -06:00

shuttle

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

surgery

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

telesci

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00