Neerti 2a45114038 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge ...

Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/datums/supplypacks.dm
	code/game/machinery/bluespacerelay.dm
	code/game/machinery/hologram.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/game/turfs/simulated/walls.dm
	code/global.dm
	code/modules/clothing/spacesuits/rig/suits/ert.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/designs.dm
	config/example/config.txt
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/rig_modules.dmi
	interface/interface.dm
	maps/exodus-3.dmm
	polaris.dme

2015-06-05 22:11:15 -04:00

..

__defines

Axed couple unused organ flags, made them look a bit nicer with bitmove

2015-06-05 11:18:07 +03:00

_helpers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

_onclick

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

ATMOSPHERICS

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

controllers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

datums

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

defines

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

FEA

Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS

2015-05-29 20:36:48 +01:00

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

TriDimension

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

ZAS

Merge pull request #9692 from Baystation12/dev-freeze

2015-06-05 20:32:30 +01:00

global.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00