Neerti b93595c19f Merge branch 'master' into 9/4/2015_master_to_dev ...

Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm

2015-09-04 08:43:37 -04:00

..

__defines

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

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

_helpers

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

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

_onclick

Adds missing TK move cooldowns, adjusts click move cooldowns

2015-08-21 23:21:54 -04:00

ATMOSPHERICS

Removes #undefine

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

controllers

colony-1 could not be saved, unfortunately. RIP

2015-08-23 18:04:47 -04:00

datums

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

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

defines

Adds variables for CentComm, NanoTrasen and the station name.

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

FEA

…

game

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

js

…

modules

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

TriDimension

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

ZAS

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

global.dm

colony-1 could not be saved, unfortunately. RIP

2015-08-23 18:04:47 -04:00

hub.dm

…

names.dm

…

setup.dm

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

stylesheet.dm

…

world.dm

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

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