Razharas 10b21b20ab Conflicts resolution ...

In items weapons melee misc

2014-12-29 11:49:30 +03:00

..

admin

Merge pull request #6490 from tkdrg/nomoreadmingrudges

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

assembly

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

2014-12-28 11:20:15 +03:00

awaymissions

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

2014-12-28 11:20:15 +03:00

client

Adds cfg option to let players see their own notes

2014-12-19 22:42:18 -03:00

clothing

Conflicts resolution

2014-12-29 11:49:30 +03: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 branch 'master' of https://github.com/tgstation/-tg-station into GenShit

2014-12-28 11:20:15 +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

Conflicts resolution

2014-12-29 11:49:30 +03:00

nano

…

paperwork

Conflict fix

2014-12-21 06:12:33 +03:00

power

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

2014-12-28 11:20:15 +03:00

projectiles

Conflicts resolution

2014-12-29 11:49:30 +03:00

reagents

General cleanup

2014-12-29 11:36:01 +03:00

recycling

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +03:00

research

Merge pull request #6620 from Menshin/missed_designs

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

scripting

…

security levels

…

shuttle

…

surgery

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

2014-12-16 02:52:08 +03:00

telesci

Fixes a lot of "the the" in messages.

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