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

Conflicts:
	README.md

2015-08-19 15:27:26 +10:00

..

admin

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

2015-08-19 15:27:26 +10:00

assembly

Logging Syntax Improvement

2015-08-13 12:14:14 -05:00

awaymissions

Renamed "glass case" -> "implant case". Changed implant syndiekit to be less FUCKS.

2015-08-01 01:56:54 +03:00

client

autoconvert notes to sql procs

2015-08-17 15:24:50 +10:00

clothing

Merge pull request #10901 from CosmicScientist/mobcostumes

2015-08-11 18:16:49 -05:00

crafting

Logging Syntax Improvement

2015-08-13 12:14:14 -05:00

detectivework

…

emoji

…

events

Preventative appendectomy prevents appendicitis

2015-08-03 15:13:00 +03:00

flufftext

…

food&drinks

Logging Syntax Improvement

2015-08-13 12:14:14 -05:00

games

…

holiday

…

html_interface

…

hydroponics

Merge pull request #11084 from bgobandit/goofbotany

2015-08-09 02:46:38 -05:00

library

…

lighting

…

mining

Merge pull request #11045 from KorPhaeron/survivalpod

2015-08-18 20:50:18 +01:00

mob

Fixes pulling bug that led to FUN!

2015-08-18 21:12:08 -07:00

nano

…

ninja

Merge pull request #10957 from Core0verload/surgery-organs-implants

2015-08-04 21:45:02 +10:00

paperwork

Revert "Adds 15-force edaggers that look and function like pens when off."

2015-08-16 00:36:08 +02:00

power

Logging Syntax Improvement

2015-08-13 12:14:14 -05:00

procedural mapping

…

projectiles

Merge pull request #11185 from Cheridan/brycepaxsbrain

2015-08-18 20:24:42 +01:00

reagents

Merge pull request #11185 from Cheridan/brycepaxsbrain

2015-08-18 20:24:42 +01:00

recycling

…

research

Merge pull request #11185 from Cheridan/brycepaxsbrain

2015-08-18 20:24:42 +01:00

scripting

…

security levels

Actually fixed

2015-08-14 22:44:34 -05:00

shuttle

…

surgery

Merge pull request #11162 from Core0verload/rnd-implants

2015-08-18 20:20:12 +01:00

telesci

…