tkdrg 77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm

2014-11-14 15:23:35 -03:00

..

admin

Moves up a */ to make respawn_character work a liiiitle bit better.

2014-11-09 15:02:32 +01:00

assembly

Fixes #5604 signaler runtime

2014-11-08 10:09:19 -03:00

awaymissions

Merge pull request #5803 from Menshin/sleeping_in_closets

2014-11-11 10:55:07 -08:00

client

Merge pull request #5490 from tkdrg/hiasl

2014-11-03 17:26:53 -08:00

clothing

Adds NODROP to the Atmos watertank nozzle. I have no regrets.

2014-11-09 13:56:12 -08:00

crafting

…

detectivework

…

events

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

flufftext

…

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

Conflicts solving

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

mining

Removed hilarious but useless sleep() in closets/boxes New()

2014-11-10 01:59:32 +01:00

mob

Merge remote-tracking branch 'upstream/master' into moarfloors

2014-11-14 15:23:35 -03:00

nano

…

paperwork

Conflicts solving

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

power

Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned

2014-11-08 15:08:40 -08:00

projectiles

Merge pull request #5644 from Jordie0608/beekeepermodewhen

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

reagents

-Adds secure atmos closets to Atmos

2014-11-09 11:16:58 -08:00

recycling

Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix

2014-11-08 09:31:52 +01:00

research

Merge pull request #5786 from Miauw62/runtime1

2014-11-10 08:43:10 -08:00

scripting

…

security levels

…

shuttle

…

surgery

…

telesci

…