Tigercat2000 356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm

2015-12-03 11:03:01 -08:00

..

particle_accelerator

Fixes up a few Destroys

2015-09-18 04:20:02 -04:00

collector.dm

Powernet rework

2015-07-31 23:59:41 +02:00

containment_field.dm

Powernet rework

2015-07-31 23:59:41 +02:00

emitter.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

field_generator.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

generator.dm

Add option to reject adminhelps

2015-08-20 23:33:09 +02:00

investigate.dm

Alarm system overhaul

2015-08-02 07:13:03 +02:00

narsie.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

singularity.dm

more de-referencing

2015-10-12 04:18:49 -04:00