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

Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm

2014-12-03 18:59:32 +01:00

..

admin

Merge pull request #6142 from CorruptComputer/dropinacancel

2014-12-03 18:12:45 +01: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

Minor optimization

2014-11-30 03:11:55 +01:00

client

Fixes assistant jobban bug

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

clothing

Merge pull request #6084 from tkdrg/hudindahood

2014-11-27 13:50:34 -08:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

removes useless spawn

2014-10-26 14:35:27 -07:00

events

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

2014-11-27 15:30:37 +03:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

food&drinks

Fix for omnious reagent transfer error

2014-11-25 15:29:59 +03:00

holiday

Spookoween should be mucho bettero now

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

hydroponics

Merge pull request #6134 from Menshin/null_loc_mobs_fix

2014-12-03 16:39:30 +00:00

library

Conflict resolve

2014-11-24 12:27:53 +03:00

mining

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

2014-11-27 15:30:37 +03:00

mob

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

2014-12-03 18:59:32 +01:00

nano

Giacom Fixes

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

paperwork

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

2014-11-23 17:46:14 +03:00

power

Merge pull request #6104 from tkdrg/bouncy

2014-12-01 18:14:12 +03:00

projectiles

Merge remote-tracking branch 'upstream/master' into wormholeProjector

2014-11-29 09:37:40 +02:00

reagents

Fixes being able to click the grinder buttons while it's operating (ejecting beaker before grinding is finished), the grinder window is now correctly updated.

2014-12-01 16:57:07 +01:00

recycling

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

2014-11-23 17:46:14 +03:00

research

Merge remote-tracking branch 'upstream/master' into wormholeProjector

2014-11-29 09:37:40 +02: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

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

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

surgery

Fixes implants not updating the implant secHUD

2014-11-27 12:56:17 -03:00

telesci

Fixes telesci runtime on memory settting

2014-11-22 17:53:44 +03:00