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

Conflicts:
	code/game/turfs/simulated/floor.dm

2014-12-27 21:54:53 -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

Adds cfg option to let players see their own notes

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

clothing

Merge pull request #6591 from phil235/FingerlessSpriteFix

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

crafting

fixed compile errors

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

detectivework

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

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

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

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

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

food&drinks

Merge pull request #6498 from as334/MobReactions

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

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

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 branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf

2014-12-27 21:54:53 -08:00

mob

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

2014-12-27 21:54:53 -08:00

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

Fixes a lot of "the the" in messages.

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

power

Merge pull request #6559 from tkdrg/hal

2014-12-27 18:42:01 +01:00

projectiles

Merge pull request #6607 from paprka/aiturrets

2014-12-28 02:21:04 -03:00

reagents

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

2014-12-27 21:54:53 -08: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

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

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

2014-10-05 13:48:11 +02:00

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