phil235 7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge ...

Conflicts:
	code/game/objects/structures/aliens.dm

2016-04-29 20:58:02 +02:00

..

admin

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

2016-04-27 17:03:32 -07:00

assembly

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

2016-03-29 14:46:06 -06:00

atmospherics

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

awaymissions

Merge pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05:00

cargo

Merge pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05:00

client

Revert "Adds player preference to hide irrelevant tablecraft recipes"

2016-04-29 17:47:31 +03:00

clothing

Merge pull request #17208 from phil235/FixMechaMaskToxin

2016-04-29 19:32:38 +03:00

crafting

Revert "Adds player preference to hide irrelevant tablecraft recipes"

2016-04-29 17:47:31 +03:00

detectivework

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

emoji

makes emoji parsing return the text if they runtime

2016-03-16 21:28:36 -07:00

events

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

2016-04-27 17:03:32 -07:00

flufftext

Move some stuff from different layers to different planes

2016-04-24 04:03:41 -07:00

food&drinks

Revert "Adds player preference to hide irrelevant tablecraft recipes"

2016-04-29 17:47:31 +03:00

games

First commit of this big PR

2016-04-24 20:26:24 +02:00

holiday

Added animal overlay to drone filters (#17009)

2016-04-24 16:51:16 +01:00

holodeck

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

html_interface

…

hydroponics

Merge pull request #17107 from Core0verload/botany_nerf

2016-04-29 13:38:36 -05:00

jobs

makes sec gloves way more obvious

2016-04-17 21:06:26 -07:00

library

First commit of this big PR

2016-04-24 20:26:24 +02:00

lighting

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

2016-04-27 17:03:32 -07:00

mining

Merge pull request #17086 from MrPerson/planes_on_a_snake

2016-04-29 15:51:41 +03:00

mob

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

ninja

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

paperwork

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

power

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

procedural mapping

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

projectiles

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

2016-04-29 20:58:02 +02:00

reagents

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

recycling

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

research

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

ruins

Merge pull request #16953 from Core0verload/onehalf

2016-04-29 15:23:50 +03:00

security levels

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

shuttle

Merge pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05:00

space transition

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

spells

Code review

2016-04-24 16:29:17 +01:00

stock_market

Changes to Stocks UI, Cargo fixes

2016-04-17 04:40:06 +03:00

surgery

Adds a few organ verbs

2016-04-14 18:53:08 -07:00

telesci

Second commits.

2016-04-24 20:37:00 +02:00

tgui

…

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

reeeeeeee

2016-04-27 03:02:00 -05:00

vehicles

Same things but with structures now.

2016-04-24 20:38:33 +02:00