Nerd Lord 4e2cefaddf Merge branch 'master' of https://github.com/tgstation/-tg-station into fixrobustinscode ...

Conflicts:
	icons/mob/mob.dmi

2016-05-08 14:33:54 -04:00

..

admin

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

assembly

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

2016-05-07 12:33:06 +02:00

atmospherics

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

awaymissions

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

2016-05-08 14:33:54 -04:00

cargo

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

client

Merge pull request #17382 from Incoming5643/badmins_doing_shit

2016-05-06 20:00:03 -04:00

clothing

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

crafting

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

2016-05-05 21:57:10 +02:00

detectivework

…

emoji

…

events

Makes a really shitty lord of the rings reference

2016-05-05 00:40:06 -05:00

flufftext

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

food&drinks

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

games

moar

2016-05-01 08:29:19 -04:00

holiday

…

holodeck

Merge pull request #17218 from phil235/FixTalkingInPipes

2016-04-29 20:34:03 -05:00

html_interface

…

hydroponics

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

jobs

helmet standard issue

2016-05-01 13:36:11 -07:00

library

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

lighting

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

mining

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

2016-05-08 14:33:54 -04:00

mob

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

ninja

Merge pull request #17245 from nullbear/c4-path

2016-05-01 16:41:07 +10:00

paperwork

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

power

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

procedural mapping

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

projectiles

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

reagents

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

recycling

…

research

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

ruins

Walker tendrils strip mobs before gibbing now

2016-05-02 14:38:41 -05:00

security levels

…

shuttle

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

space transition

…

spells

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

2016-05-08 14:33:54 -04:00

stock_market

fixes a typo

2016-04-30 07:31:26 -04:00

surgery

Fixes lizard body markings appearing behind the bodypart layer.

2016-05-07 01:00:00 +02:00

telesci

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

tgui

…

tooltip

…

uplink

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

2016-05-05 21:57:10 +02:00

vehicles

…