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

2014-11-18 16:23:04 +03:00

..

admin

Removes old/unused code from the tree. Use version control if you need it for some reason.

2014-11-16 16:53:18 -03:00

assembly

Fixes #5604 signaler runtime

2014-11-08 10:09:19 -03: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

fixes a grammarical error

2014-11-13 21:13:55 -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 #5884 from tkdrg/ionblastUSA

2014-11-17 09:48:04 +00:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

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

food&drinks

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

2014-11-08 01:07:29 +00: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 beekeepermodewhen

2014-11-09 00:15:12 +11:00

library

Made explosions work in a slightly different way

2014-11-18 16:22:41 +03:00

mining

Made explosions work in a slightly different way

2014-11-18 16:22:41 +03:00

mob

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

2014-11-18 16:23:04 +03:00

nano

Giacom Fixes

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

paperwork

Conflicts solving

2014-11-04 20:24:52 +01:00

power

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

2014-11-18 16:23:04 +03:00

projectiles

Merge pull request #5644 from Jordie0608/beekeepermodewhen

2014-11-13 17:04:29 -06:00

reagents

Made explosions work in a slightly different way

2014-11-18 16:22:41 +03:00

recycling

Made explosions work in a slightly different way

2014-11-18 16:22:41 +03: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

removing comment.

2014-09-21 22:26:18 +02:00

telesci

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00