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

Conflicts:
	code/modules/clothing/head/soft_caps.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

2014-12-19 10:41:27 -08:00

..

admin

Merge pull request #6333 from tkdrg/singulobj

2014-12-14 10:02:39 +03:00

assembly

Fixes not being able to hear the beeping of infrared beam, timer and proximity sensor in the dark.

2014-11-22 22:56:13 +01:00

awaymissions

Merge pull request #6333 from tkdrg/singulobj

2014-12-14 10:02:39 +03:00

client

Fixes assistant jobban bug

2014-11-27 16:51:15 -03:00

clothing

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

2014-12-19 10:41:27 -08:00

crafting

FRAG-12 + admins.txt

2014-12-11 21:16:45 +00:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

events

Covers up traces of the coder conspiracy.

2014-12-08 17:06:27 +01:00

flufftext

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

food&drinks

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

holiday

…

hydroponics

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

library

Fixes monkeys being able to read books

2014-12-14 13:06:33 -05:00

mining

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

mob

Merge branch 'master' into scarfs

2014-12-18 23:35:15 -03:00

nano

…

paperwork

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

power

Merge pull request #6420 from phil235/TypoFix2

2014-12-17 16:06:35 -06:00

projectiles

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

reagents

Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio.

2014-12-15 01:30:18 +01:00

recycling

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

research

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

scripting

…

security levels

…

shuttle

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

surgery

Making nutrition level values into defines.

2014-12-13 17:15:35 +01:00

telesci

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00