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

Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-24 21:22:37 +02:00

..

admin

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

2016-04-24 21:22:37 +02:00

assembly

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

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

atmospherics

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

2016-04-24 21:22:37 +02:00

awaymissions

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

2016-04-24 21:22:37 +02:00

cargo

Removes the blatantly copyrighted sans and papyrus action figures and the blatantly copyrighted sounds attached to them.

2016-04-16 00:19:35 -04:00

client

Gatling Autoclick

2016-04-23 13:47:05 -05:00

clothing

no more krav maga probably

2016-04-21 18:17:40 -07:00

crafting

Merge pull request #17036 from TechnoAlchemisto/goliathbones

2016-04-22 18:08:51 -05: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

Fixes the other compile errors.

2016-04-10 20:23:52 -04:00

flufftext

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

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

food&drinks

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

2016-04-24 21:22:37 +02: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

First commit of this big PR

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

html_interface

…

hydroponics

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

2016-04-24 21:22:37 +02: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

fixes huge roundstart bugs

2016-03-30 16:07:35 -06:00

mining

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

2016-04-24 21:22:37 +02:00

mob

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

2016-04-24 21:22:37 +02:00

ninja

Second commits.

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

paperwork

Second commits.

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

power

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

2016-04-24 21:22:37 +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 AttackbyDestruction

2016-04-24 21:22:37 +02:00

reagents

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

2016-04-24 21:22:37 +02:00

recycling

Second commits.

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

research

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

2016-04-24 21:22:37 +02:00

ruins

Removes ash walker underwear

2016-04-21 03:10:50 -05:00

security levels

…

shuttle

Second commits.

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

space transition

praise the good lord, for the game finally compiles

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

spells

praise the good lord, for the game finally compiles

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

stock_market

tweaks

2016-04-02 18:36:13 -04: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

Crate being 30 player minimum is stupid

2016-04-14 13:47:40 -03:00

vehicles

Same things but with structures now.

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