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

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi

2015-01-15 21:56:23 -08:00

..

__DEFINES

Fix a typo and replace 7 with ZLEVEL_SPACEMAX. Making a ZLEVEL_ABANDONNEDTSAT define.

2015-01-14 14:24:18 +01:00

__HELPERS

Merge remote-tracking branch 'remotes/upstream/master' into knife_fix

2015-01-05 21:35:05 -05:00

_globalvars

EmergencyResponseTeamV2

2015-01-11 19:21:38 +08:00

_onclick

Merge pull request #6626 from psykzz/patch-1

2015-01-06 01:54:47 -03:00

ATMOSPHERICS

Merge pull request #6830 from Menshin/atmos_null_parent_fix

2015-01-07 00:20:36 -03:00

controllers

Merge pull request #6595 from tkdrg/guncargo

2015-01-15 13:06:36 +01:00

datums

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

2015-01-15 21:56:23 -08:00

defines

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

game

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

2015-01-15 21:56:23 -08:00

js

…

LINDA

Resolves #3947 - Fires can now spread on shuttle turfs (and all simulated turfs). However, fires will not burn non-turf/simulated/floor

2015-01-11 00:11:22 +00:00

modules

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

2015-01-15 21:56:23 -08:00

_compile_options.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

hub.dm

…

world.dm

Merge pull request #6806 from paprka/endroundshuttle

2015-01-06 01:19:24 -03:00