Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme

2015-08-23 01:30:46 -04:00

..

alien.dm

Updated body_parts_covered

2014-07-26 17:06:08 -07:00

armor.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

bio.dm

Removes MASK/HEADCOVERSMOUTH

2015-08-18 17:20:36 -04:00

jobs.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

labcoat.dm

Fixed typo that broke everything

2014-11-16 03:31:22 -05:00

miscellaneous.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

storage.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-20 20:40:06 +02:00

utility.dm

Removes MASK/HEADCOVERSMOUTH

2015-08-18 17:20:36 -04:00

wiz_robe.dm

Updates more hats

2015-06-28 01:50:05 -04:00