YotaXP febfa4d1e5 Merge branch 'qdel-with-datums' ...

Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm

2014-03-27 21:46:53 -04:00

..

admin

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

2014-03-26 08:00:20 +00:00

assembly

Initial pass to convert LF to CRLF

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

awaymissions

Initial pass to convert LF to CRLF

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

client

Initial pass to convert LF to CRLF

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

clothing

Initial pass to convert LF to CRLF

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

detectivework

You can now properly clean your hands of blood. Fixes #2258.

2014-01-22 17:42:36 +00:00

events

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04: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

Happy St Patrick's Day!

2014-03-17 15:15:58 -05:00

hydroponics

Initial pass to convert LF to CRLF

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

library

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

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

mining

Initial pass to convert LF to CRLF

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

mob

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

nano

Initial pass to convert LF to CRLF

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

paperwork

Initial pass to convert LF to CRLF

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

power

Modernised the solar control computer's UI.

2014-03-26 16:28:33 +00:00

projectiles

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

2014-03-26 13:03:12 -04:00

reagents

Merge pull request #3140 from phil235/chocofix

2014-03-26 03:05:31 -03:00

recycling

Initial pass to convert LF to CRLF

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

research

Initial pass to convert LF to CRLF

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

scripting

NTSL, parrots, and ID consoles hate apostrophes less.

2013-11-30 14:33:02 -05: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