paprka 13539c5c8e Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	code/modules/clothing/gloves/boxing.dm
	code/modules/clothing/gloves/miscellaneous.dm

2014-12-29 20:19:57 -08:00

..

admin

Merge pull request #6490 from tkdrg/nomoreadmingrudges

2014-12-27 19:25:43 -08:00

assembly

Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.

2014-12-24 01:50:19 +01:00

awaymissions

Merge pull request #6591 from phil235/FingerlessSpriteFix

2014-12-27 15:46:43 -03:00

client

Merge pull request #6616 from paprka/pointerpride

2014-12-29 16:47:07 -03:00

clothing

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

2014-12-29 20:19:57 -08:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

…

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #6591 from phil235/FingerlessSpriteFix

2014-12-27 15:46:43 -03:00

flufftext

Fixes hallucinated attackers not doing the attack animation.

2014-12-27 22:41:13 +01:00

food&drinks

Merge pull request #6498 from as334/MobReactions

2014-12-27 01:20:18 -06:00

holiday

…

hydroponics

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

2014-12-22 19:55:04 -08:00

library

Fixes monkeys being able to read books

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

mining

Merge pull request #6586 from phil235/ResonatorTableFix

2014-12-27 15:06:36 -03:00

mob

Merge pull request #6640 from Nyvrem/master

2014-12-29 15:00:01 -03:00

nano

…

paperwork

Fixes a lot of "the the" in messages.

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

power

Merge pull request #6601 from paprka/walkthecat

2014-12-29 19:05:41 -08:00

projectiles

Merge pull request #6622 from Thunder12345/grammarFixes

2014-12-29 10:20:35 -03:00

reagents

Merge pull request #6638 from paprka/beamexplody

2014-12-29 10:37:43 -03:00

recycling

Ok now explosions shall work properly

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

research

Merge pull request #6620 from Menshin/missed_designs

2014-12-27 20:35:08 +01:00

scripting

…

security levels

…

shuttle

…

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