GunHog 60c9106f05 Merge remote-tracking branch 'remotes/upstream/master' into Malf_RCD-defense ...

Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm

2015-08-19 09:56:16 -05:00

..

__DEFINES

first pass of cleaning up construction.dm + merge from upstream

2015-08-14 20:55:09 -06:00

__HELPERS

I screwed up that merge

2015-08-14 21:36:35 -06:00

_globalvars

Buffs RCD disable Malf power

2015-08-17 11:03:53 -05:00

_onclick

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

ATMOSPHERICS

Merge pull request #11119 from phil235/VaporizeMethodReaction

2015-08-19 19:23:17 +10:00

controllers

Merge pull request #11239 from Firecage/del2qdel

2015-08-19 11:50:24 +02:00

datums

Merge pull request #11239 from Firecage/del2qdel

2015-08-19 11:50:24 +02:00

game

Merge remote-tracking branch 'remotes/upstream/master' into Malf_RCD-defense

2015-08-19 09:56:16 -05:00

js

…

LINDA

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

2015-08-16 23:34:03 +02:00

modules

Merge pull request #11262 from KorPhaeron/standproud

2015-08-19 19:53:13 +10:00

orphaned procs

…

_compile_options.dm

…

hub.dm

…

world.dm

clean up world.dm

2015-08-18 14:35:55 +12:00