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

Conflicts:
	code/modules/clothing/head/helmet.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-07-18 12:52:40 +02:00

..

admin

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

2014-07-15 14:31:45 -05:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

2014-06-13 09:16:30 +01:00

awaymissions

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

2014-07-07 13:42:31 -04:00

client

MONKEY MODE: "IT ACTUALLY WORKS" EDITION

2014-07-08 22:55:47 -05:00

clothing

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

2014-07-18 12:52:40 +02:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

2014-05-02 17:46:04 +01:00

events

Fixed the crash with immovable rods

2014-07-12 20:44:48 -03: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

paprikkas gay

2014-07-10 20:12:24 -07:00

hydroponics

Signed-off-by: Firecage <firecage@hotmail.com>

2014-07-15 22:36:54 +02:00

library

carved books now turn into storage items

2014-05-16 14:30:04 -07:00

mining

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

2014-07-07 13:42:31 -04:00

mob

Small fixes for camera lights

2014-07-18 02:44:26 +04:00

nano

Initial pass to convert LF to CRLF

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

paperwork

Merge pull request #4150 from Ikarrus/miningfix

2014-07-17 09:30:19 +01:00

power

Ghost Alerts p II

2014-07-07 15:21:32 -05:00

projectiles

paprikkas gay

2014-07-10 20:12:24 -07:00

reagents

Merge pull request #4149 from paprka/lemonlime

2014-07-17 09:31:40 +01:00

recycling

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

2014-07-07 13:42:31 -04:00

research

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

2014-07-07 13:42:31 -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

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

2014-07-07 13:42:31 -04:00

surgery

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

2014-07-07 13:42:31 -04:00

telesci

Initial pass to convert LF to CRLF

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