Cheridan d124415c85 Merge pull request #6212 from GunHog/DS_Ninja_Biosuit_Anti-acid ...

Acid immunity for Biosuits, Ninja, and DeathSquad, and fire protection for DeathSquad

2014-12-05 14:45:53 -06: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

Not idea why if(_dmm_preloader) fails to catch nulls...

2014-12-03 20:03:47 +01:00

client

Fixes assistant jobban bug

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

clothing

Acid protection for Biosuits, Ninja, and DeathSquad

2014-12-03 22:58:21 -06:00

crafting

…

detectivework

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

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

events

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

2014-11-27 15:30:37 +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 #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

holiday

…

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 pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

nano

…

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 #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

projectiles

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

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

reagents

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

recycling

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

research

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

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

scripting

…

security levels

…

shuttle

…

surgery

Fixes implants not updating the implant secHUD

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

telesci

Merge pull request #6026 from phil235/BluespaceCrystalVanishFix

2014-12-04 09:32:02 -06:00