Remie Richards 5343f2d1fa Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAcidBalance ...

Conflicts:
	code/modules/mob/living/living_defense.dm

2014-11-26 19:01:17 +00:00

..

admin

Merge pull request #5908 from tkdrg/hud

2014-11-25 12:53:03 -08: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 #5802 from paprka/EATITFATTY

2014-11-15 20:28:43 -08:00

client

Merge pull request #5490 from tkdrg/hiasl

2014-11-03 17:26:53 -08:00

clothing

Merge pull request #5908 from tkdrg/hud

2014-11-25 12:53:03 -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 pull request #5908 from tkdrg/hud

2014-11-25 12:53:03 -08: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 #5908 from tkdrg/hud

2014-11-25 12:53:03 -08:00

library

Fixes wood duplicating exploit with bookcase

2014-11-21 20:54:29 -03:00

mining

Makes data huds passive.

2014-11-16 01:52:06 -03:00

mob

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

2014-11-26 19:01:17 +00:00

nano

Giacom Fixes

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

paperwork

Fixes issues with TK teleporting pictures and harvested plants.

2014-11-18 15:49:03 -03:00

power

Merge pull request #5989 from Menshin/cables_cutting_fix

2014-11-23 23:35:21 +03:00

projectiles

Merge pull request #5875 from phil235/RevolverMalfFix

2014-11-23 15:11:28 +00:00

reagents

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

2014-11-26 19:01:17 +00:00

recycling

fixes disposals flushing their stored construct

2014-11-17 11:30:33 -08:00

research

Fixes phazon chassis availability in the mech fabricator, they were missing.

2014-11-14 14:45:38 -03: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

Makes data huds passive.

2014-11-16 01:52:06 -03:00

telesci

Fixes telesci runtime on memory settting

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